Merge remote-tracking branch 'origin/ignite-901' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf97d042 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf97d042 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf97d042 Branch: refs/heads/ignite-901 Commit: bf97d042a669921f19c80dee0ef0d2009e4789e6 Parents: 3508bce c4abdf4 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jul 3 15:15:32 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jul 3 15:15:32 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheGateway.java | 4 +- .../GridCachePartitionExchangeManager.java | 72 ++++++++++---------- .../datastructures/DataStructuresProcessor.java | 12 ++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 4 +- .../IgniteClientReconnectAbstractTest.java | 2 +- .../IgniteClientReconnectAtomicsTest.java | 8 +-- .../IgniteClientReconnectCacheTest.java | 13 ++++ ...IgniteClientReconnectDiscoveryStateTest.java | 4 +- 8 files changed, 73 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf97d042/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java ----------------------------------------------------------------------
