You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/10 14:12:52 UTC

[41/51] incubator-ignite git commit: Merge branch 'ignite-712' into ignite-sprint-3

Merge branch 'ignite-712' into ignite-sprint-3


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d9d6f35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d9d6f35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d9d6f35

Branch: refs/heads/ignite-709
Commit: 9d9d6f3547d286bff188785cd0c60f0d372be4a4
Parents: bad0161 1003684
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Fri Apr 10 00:17:28 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Fri Apr 10 00:17:28 2015 -0700

----------------------------------------------------------------------
 .../discovery/GridDiscoveryManager.java         |  3 +-
 .../processors/cache/GridCacheProcessor.java    | 52 ++++++++++----------
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  6 ++-
 .../tcp/TcpClientDiscoverySelfTest.java         |  6 ++-
 .../IgniteSpiDiscoverySelfTestSuite.java        |  2 +
 5 files changed, 40 insertions(+), 29 deletions(-)
----------------------------------------------------------------------