You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/12/07 20:06:01 UTC
[4/4] storm git commit: Merge branch 'storm-1364-merge'
Merge branch 'storm-1364-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2b7a7583
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2b7a7583
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2b7a7583
Branch: refs/heads/master
Commit: 2b7a758396c3a0529524b293a9c773e974f70b56
Parents: 3600953 934f28a
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Dec 7 12:55:43 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Dec 7 12:55:43 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 6 +++++-
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 6 +++++-
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++--
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 8 ++++++--
storm-core/src/clj/backtype/storm/ui/core.clj | 8 ++++++--
storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj | 8 ++++++--
7 files changed, 35 insertions(+), 10 deletions(-)
----------------------------------------------------------------------