Merge branch 'STORM-1927' of https://github.com/Ethanlm/storm into STORM-1927-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a1ab78b2 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a1ab78b2 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a1ab78b2 Branch: refs/heads/master Commit: a1ab78b2b0087096e2d019238c72c6e527c44082 Parents: 29f845b 44855ba Author: Jungtaek Lim <[email protected]> Authored: Sat Oct 28 19:16:56 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sat Oct 28 19:16:56 2017 +0900 ---------------------------------------------------------------------- flux/flux-examples/pom.xml | 4 + pom.xml | 10 +- storm-client/pom.xml | 6 +- storm-core/pom.xml | 6 +- storm-core/src/clj/org/apache/storm/ui/core.clj | 6 +- .../src/clj/org/apache/storm/ui/helpers.clj | 8 -- .../src/jvm/org/apache/storm/ui/UIHelpers.java | 104 +++++++++++-------- .../org/apache/storm/daemon/nimbus/Nimbus.java | 2 +- .../apache/storm/daemon/drpc/DRPCServer.java | 10 +- 9 files changed, 90 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/a1ab78b2/storm-client/pom.xml ----------------------------------------------------------------------
