You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/01/06 17:40:53 UTC
[06/11] storm git commit: Merge remote-tracking branch
'upstream/master' into STORM-586
Merge remote-tracking branch 'upstream/master' into STORM-586
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cb548dd1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb548dd1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cb548dd1
Branch: refs/heads/master
Commit: cb548dd13b4b90d64f41ce85e8268f7bab153d56
Parents: 63c8636 f76b3e7
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Wed Dec 17 19:20:00 2014 -0800
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Wed Dec 17 19:20:00 2014 -0800
----------------------------------------------------------------------
CHANGELOG.md | 3 +++
external/storm-kafka/README.md | 2 +-
logback/cluster.xml | 2 +-
storm-core/src/clj/backtype/storm/daemon/executor.clj | 2 +-
storm-core/src/clj/backtype/storm/messaging/loader.clj | 3 ++-
storm-core/src/ui/public/component.html | 2 +-
6 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------