Merge pull request #1944 from gearpump/revert-1942-standalone_nimbus Revert "fix #1895, make GearpumpNimbus a standalone service"
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/f136b3e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/f136b3e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/f136b3e7 Branch: refs/heads/master Commit: f136b3e7f0cd7740bcec6ed3a3421e4cbb1e279f Parents: 7f48c12 b8f8bb1 Author: ManuZhang <[email protected]> Authored: Tue Feb 2 07:57:07 2016 +0800 Committer: ManuZhang <[email protected]> Committed: Tue Feb 2 07:57:07 2016 +0800 ---------------------------------------------------------------------- docs/dev-storm.md | 40 +-- .../gearpump/experiments/storm/Commands.scala | 36 +++ .../storm/GearpumpThriftServer.scala | 143 +++++++++++ .../experiments/storm/StormRunner.scala | 137 ++++++++-- .../experiments/storm/main/GearpumpNimbus.scala | 247 ------------------- .../storm/main/GearpumpStormClient.scala | 70 ------ .../storm/topology/GearpumpStormTopology.scala | 52 +++- .../experiments/storm/GearpumpNimbusSpec.scala | 68 +++++ .../storm/GearpumpThriftServerSpec.scala | 48 ++++ .../experiments/storm/StormRunnerSpec.scala | 58 +++++ .../topology/GearpumpStormTopologySpec.scala | 20 +- .../integrationtest/storm/StormClient.scala | 14 +- project/Pack.scala | 2 +- .../io/gearpump/services/MasterService.scala | 2 +- 14 files changed, 537 insertions(+), 400 deletions(-) ----------------------------------------------------------------------
