Merge branch 'storm-pr-1408-1.0.x' into 1.0.x-branch

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d69d4aaf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d69d4aaf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d69d4aaf

Branch: refs/heads/1.0.x-branch
Commit: d69d4aaf626f3e47f48706ece8faa7bba14203ca
Parents: 44d9530 3bf0656
Author: Jungtaek Lim <[email protected]>
Authored: Mon May 16 18:44:49 2016 +0900
Committer: Jungtaek Lim <[email protected]>
Committed: Mon May 16 18:44:49 2016 +0900

----------------------------------------------------------------------
 .../src/main/resources/resources/storm.js          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


Reply via email to