Merge remote-tracking branch 'upstream/master' into STORM-166
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1dccc1bd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1dccc1bd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1dccc1bd Branch: refs/heads/0.11.x-branch Commit: 1dccc1bde7266bad489c5c9678c9446b13107564 Parents: 6b0da16 f76b3e7 Author: Parth Brahmbhatt <[email protected]> Authored: Wed Dec 17 10:31:27 2014 -0800 Committer: Parth Brahmbhatt <[email protected]> Committed: Wed Dec 17 10:31:27 2014 -0800 ---------------------------------------------------------------------- CHANGELOG.md | 2 ++ logback/cluster.xml | 2 +- storm-core/src/clj/backtype/storm/daemon/executor.clj | 2 +- storm-core/src/ui/public/component.html | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
