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/ff17cafa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff17cafa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff17cafa Branch: refs/heads/ignite-929 Commit: ff17cafa834bc2c8cf26618d716a53ec4fb3a352 Parents: 7ec45f9 9480e8d Author: sboikov <sboi...@gridgain.com> Authored: Mon May 25 09:10:45 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon May 25 09:10:45 2015 +0300 ---------------------------------------------------------------------- .../discovery/CustomMessageWrapper.java | 5 ++ .../discovery/DiscoveryCustomMessage.java | 5 ++ .../discovery/GridDiscoveryManager.java | 26 +++++----- .../cache/DynamicCacheChangeBatch.java | 5 ++ .../continuous/AbstractContinuousMessage.java | 54 ++++++++++++++++++++ .../StartRoutineAckDiscoveryMessage.java | 26 ++++------ .../StartRoutineDiscoveryMessage.java | 27 ++++------ .../StopRoutineAckDiscoveryMessage.java | 21 +++----- .../continuous/StopRoutineDiscoveryMessage.java | 23 +++------ .../discovery/DiscoverySpiCustomMessage.java | 5 ++ .../discovery/tcp/TcpClientDiscoverySpi.java | 8 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 14 ++--- .../TcpDiscoveryCustomEventMessage.java | 31 +++++++++-- .../GridDiscoveryManagerAliveCacheSelfTest.java | 41 +++++++++------ .../continuous/GridEventConsumeSelfTest.java | 2 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 36 +++++++++---- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 3 +- 17 files changed, 214 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff17cafa/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff17cafa/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ----------------------------------------------------------------------
