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/09/25 11:46:01 UTC

[3/4] storm git commit: Merge branch 'STORM-2105-1.x' into 1.x-branch

Merge branch 'STORM-2105-1.x' 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/9b9d3802
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b9d3802
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b9d3802

Branch: refs/heads/1.x-branch
Commit: 9b9d3802b6ed654858f45f2a1078c470e2d8a9e0
Parents: 38ccb3e dbab92a
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Sep 25 20:45:29 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Sep 25 20:45:29 2016 +0900

----------------------------------------------------------------------
 docs/STORM-UI-REST-API.md                       |  17 ++-
 storm-core/src/clj/org/apache/storm/ui/core.clj |  24 +++-
 storm-core/src/ui/public/index.html             | 126 ++++++++++---------
 .../public/templates/index-page-template.html   | 117 +++++++++++++----
 .../templates/supervisor-page-template.html     |  16 +++
 5 files changed, 214 insertions(+), 86 deletions(-)
----------------------------------------------------------------------