Merge pull request #1976 from manuzhang/fix_it fix #1975, fix storm integration test
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/c3df2ed1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/c3df2ed1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/c3df2ed1 Branch: refs/heads/master Commit: c3df2ed189d1435991e578208c83b13acd9a588f Parents: 42806a9 920ad26 Author: ManuZhang <[email protected]> Authored: Wed Feb 24 19:49:35 2016 +0800 Committer: ManuZhang <[email protected]> Committed: Wed Feb 24 19:49:35 2016 +0800 ---------------------------------------------------------------------- .../experiments/storm/main/GearpumpNimbus.scala | 27 ++++++---- .../storm/main/GearpumpStormClient.scala | 2 +- .../checklist/StormCompatibilitySpec.scala | 51 +++++++++++-------- .../suites/StandaloneModeSuite.scala | 4 +- .../integrationtest/storm/StormClient.scala | 52 +++++++++----------- project/Build.scala | 3 +- .../streaming/appmaster/ClockService.scala | 2 - 7 files changed, 74 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
