Repository: incubator-gearpump Updated Branches: refs/heads/master [created] d5343681e
Merge pull request #1940 from clockfly/issue_1932 fix #1932, client config overwrites critical system config Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/20c62e5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/20c62e5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/20c62e5a Branch: refs/heads/master Commit: 20c62e5a331b436be4f5cb91663bc1c0057ae2fb Parents: 2566c0e 847fdf8 Author: Sean Zhong <[email protected]> Authored: Fri Jan 29 16:57:43 2016 +0800 Committer: Sean Zhong <[email protected]> Committed: Fri Jan 29 16:57:43 2016 +0800 ---------------------------------------------------------------------- .../io/gearpump/cluster/ClusterConfig.scala | 2 +- .../io/gearpump/cluster/worker/Worker.scala | 57 +++++++++++--------- 2 files changed, 34 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
