You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/01/20 23:24:51 UTC
[36/36] storm git commit: Merge branch '1.x-branch' of
https://git-wip-us.apache.org/repos/asf/storm into 1.x-branch
Merge branch '1.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ce1d5b1a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ce1d5b1a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ce1d5b1a
Branch: refs/heads/1.x-branch
Commit: ce1d5b1aa48214bce48749d206cc0db34a41a413
Parents: e861cfe bb503d2
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jan 21 07:22:32 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jan 21 07:22:32 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
conf/defaults.yaml | 6 +-
.../clj/org/apache/storm/daemon/supervisor.clj | 5 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 123 ++++++++++---------
storm-core/src/jvm/org/apache/storm/Config.java | 4 +-
storm-core/src/ui/public/component.html | 2 +-
.../templates/component-page-template.html | 2 +
storm-dist/binary/src/main/assembly/binary.xml | 1 +
8 files changed, 84 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ce1d5b1a/CHANGELOG.md
----------------------------------------------------------------------