Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9347e679 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9347e679 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9347e679 Branch: refs/heads/ignite-23 Commit: 9347e679867b68bb33c24aabd64939abfbd75f2d Parents: 32cb360 2ca18ba Author: sboikov <sboi...@gridgain.com> Authored: Tue May 26 17:47:17 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue May 26 17:47:17 2015 +0300 ---------------------------------------------------------------------- .../internal/GridEventConsumeHandler.java | 106 ++++++++++--------- .../continuous/GridContinuousProcessor.java | 44 ++++++++ .../discovery/tcp/TcpClientDiscoverySpi.java | 5 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 5 + .../apache/ignite/internal/GridSelfTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../continuous/GridEventConsumeSelfTest.java | 2 +- 8 files changed, 109 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9347e679/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ----------------------------------------------------------------------
