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:16 UTC

[14/50] incubator-gearpump git commit: Merge pull request #1949 from whjiang/timeout-1910

Merge pull request #1949 from whjiang/timeout-1910

fix #1910 enlarge timeout in MasterClient

Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/89292aca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/89292aca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/89292aca

Branch: refs/heads/master
Commit: 89292aca9707efdd00a91e3ab464afbb09186346
Parents: e8d224e f7347a8
Author: Sean Zhong <xi...@intel.com>
Authored: Wed Feb 3 09:12:53 2016 +0800
Committer: Sean Zhong <xi...@intel.com>
Committed: Wed Feb 3 09:12:53 2016 +0800

----------------------------------------------------------------------
 core/src/main/resources/geardefault.conf              |  3 +++
 .../io/gearpump/cluster/client/ClientContext.scala    | 14 ++++++++++----
 .../io/gearpump/cluster/client/MasterClient.scala     |  5 +++--
 core/src/main/scala/io/gearpump/util/Constants.scala  |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------