storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [12/14] storm git commit: Merge branch 'master' of https://github.com/YvonneIronberg/storm into STORM-976-merge
Date Tue, 18 Aug 2015 15:50:30 GMT
Merge branch 'master' of https://github.com/YvonneIronberg/storm into STORM-976-merge


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f6e2aa5a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f6e2aa5a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f6e2aa5a

Branch: refs/heads/master
Commit: f6e2aa5a085341d017eefbc43d4c29bf1413e80f
Parents: 6f37493 89f4809
Author: Derek Dagit <derekd@yahoo-inc.com>
Authored: Tue Aug 18 09:51:57 2015 -0500
Committer: Derek Dagit <derekd@yahoo-inc.com>
Committed: Tue Aug 18 09:51:57 2015 -0500

----------------------------------------------------------------------
 SECURITY.md                                     |  2 +-
 bin/storm-config.cmd                            | 18 +++++------
 bin/storm.py                                    | 22 ++++++-------
 conf/defaults.yaml                              |  1 +
 docs/documentation/FAQ.md                       |  7 ++--
 .../flux-core/src/test/resources/log4j2.xml     | 34 ++++++++++++++++++++
 .../flux-core/src/test/resources/logback.xml    | 30 -----------------
 .../src/clj/backtype/storm/daemon/logviewer.clj |  2 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  9 +++---
 storm-core/src/jvm/backtype/storm/Config.java   |  6 ++++
 10 files changed, 72 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f6e2aa5a/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------


Mime
View raw message