You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ap...@apache.org on 2016/04/11 20:26:52 UTC
[50/50] incubator-gearpump git commit: Merge pull request #2000 from
clockfly/issue_1996
Merge pull request #2000 from clockfly/issue_1996
fix #1996, EmbeddedCluster requires master configuration like ClusterActorRefProvider
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/d5343681
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/d5343681
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/d5343681
Branch: refs/heads/master
Commit: d5343681edde427022bf4c225ce6022a6904ae88
Parents: a7bbb4c ecf5b46
Author: Sean Zhong <xi...@intel.com>
Authored: Thu Mar 10 10:43:22 2016 +0800
Committer: Sean Zhong <xi...@intel.com>
Committed: Thu Mar 10 10:43:22 2016 +0800
----------------------------------------------------------------------
conf/gear.conf | 54 +++-
core/src/main/resources/geardefault.conf | 279 ++++++++++++-------
.../io/gearpump/cluster/ClusterConfig.scala | 10 +-
.../main/scala/io/gearpump/util/ActorUtil.scala | 4 -
.../main/scala/io/gearpump/util/Constants.scala | 2 +-
core/src/test/resources/test.conf | 10 +-
.../cluster/embedded/EmbeddedCluster.scala | 89 ++++++
.../gearpump/cluster/local/LocalCluster.scala | 88 ------
.../scala/io/gearpump/cluster/main/Local.scala | 1 -
.../examples/wordcountjava/WordCount.java | 20 +-
.../examples/wordcount/WordCount.scala | 20 +-
.../stream/gearpump/graph/RemoteGraph.scala | 4 +-
.../checklist/CommandLineSpec.scala | 10 +-
.../io/gearpump/streaming/task/TaskUtil.scala | 3 +-
14 files changed, 373 insertions(+), 221 deletions(-)
----------------------------------------------------------------------