Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
# Conflicts: # modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8343058d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8343058d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8343058d Branch: refs/heads/ignite-1003-debug Commit: 8343058d5079344593af1dfdc04f004a9a02d843 Parents: 8e8433b f4b1123 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Jun 16 13:52:51 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Jun 16 13:52:51 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/query/ScanQuery.java | 20 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../discovery/GridDiscoveryManager.java | 9 +- .../processors/cache/GridCacheProcessor.java | 11 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 28 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 439 ++++++++++++------- .../ignite/spi/discovery/tcp/ServerImpl.java | 221 ++++++---- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 +++ .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../cache/CacheClientStoreSelfTest.java | 228 ++++++++++ ...acheReadOnlyTransactionalClientSelfTest.java | 327 -------------- .../distributed/IgniteCacheManyClientsTest.java | 142 +++++- ...CacheClientWriteBehindStoreAbstractTest.java | 104 +++++ ...teCacheClientWriteBehindStoreAtomicTest.java | 38 ++ .../IgnteCacheClientWriteBehindStoreTxTest.java | 32 ++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../testsuites/IgniteCacheTestSuite4.java | 4 +- .../IgniteCacheWriteBehindTestSuite.java | 2 + 23 files changed, 1172 insertions(+), 646 deletions(-) ----------------------------------------------------------------------
