storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [08/11] storm git commit: Merge remote-tracking branch 'upstream/master'
Date Tue, 25 Aug 2015 03:05:26 GMT
Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: 044ed00c38a26c5a18b806439aeade5fc2e64035
Parents: e2b08eb 9c94188
Author: rohan_agarwal <rohanag12@gmail.com>
Authored: Wed Aug 19 10:10:20 2015 +0530
Committer: rohan_agarwal <rohanag12@gmail.com>
Committed: Wed Aug 19 10:10:20 2015 +0530

----------------------------------------------------------------------
 CHANGELOG.md                                    |  2 ++
 README.markdown                                 |  1 +
 SECURITY.md                                     |  2 +-
 bin/storm-config.cmd                            | 18 +++++------
 bin/storm.py                                    | 22 ++++++-------
 conf/defaults.yaml                              |  2 ++
 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   | 14 ++++++++
 12 files changed, 84 insertions(+), 59 deletions(-)
----------------------------------------------------------------------



Mime
View raw message