storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [14/14] storm git commit: Merge STORM-976
Date Tue, 18 Aug 2015 15:50:32 GMT
Merge STORM-976


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

Branch: refs/heads/master
Commit: 3b1b3bfa595851afd468594079caa7c772dafd48
Parents: 6f37493 1b401e4
Author: Derek Dagit <derekd@yahoo-inc.com>
Authored: Tue Aug 18 09:56:04 2015 -0500
Committer: Derek Dagit <derekd@yahoo-inc.com>
Committed: Tue Aug 18 09:56:04 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.md                                    |  1 +
 README.markdown                                 |  1 +
 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 ++++
 12 files changed, 74 insertions(+), 59 deletions(-)
----------------------------------------------------------------------



Mime
View raw message