Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-714
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e87ad413 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e87ad413 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e87ad413 Branch: refs/heads/ignite-737 Commit: e87ad413183bba4cad5a34961c897df596606f09 Parents: 71f3d67 2bc1c17 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Apr 10 00:23:55 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Apr 10 00:23:55 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e87ad413/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e87ad413/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ----------------------------------------------------------------------
