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 2017/01/12 14:39:49 UTC
[2/3] storm git commit: Merge branch 'STORM-2268-1.x-merge' into
1.x-branch
Merge branch 'STORM-2268-1.x-merge' 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/aff1e7e1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aff1e7e1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aff1e7e1
Branch: refs/heads/1.x-branch
Commit: aff1e7e1765916d38a6984b5ed704734cf4a869f
Parents: 67eb388 ff0e076
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jan 12 23:38:23 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jan 12 23:38:23 2017 +0900
----------------------------------------------------------------------
integration-test/config/Vagrantfile | 9 +++----
integration-test/config/install-storm.sh | 7 +++---
integration-test/pom.xml | 2 +-
integration-test/run-it.sh | 26 +++++++++++---------
.../org/apache/storm/st/wrapper/TopoWrap.java | 2 +-
5 files changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------