Merge branch 'ignite-1.5' into ignite-2100
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c19f3b94 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c19f3b94 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c19f3b94 Branch: refs/heads/ignite-2100 Commit: c19f3b942788452e30d62419c3e5d26d4ac75a00 Parents: 2e2d474 301d522 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Dec 15 16:57:08 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Dec 15 16:57:08 2015 +0300 ---------------------------------------------------------------------- bin/ignitevisorcmd.bat | 1 + modules/clients/pom.xml | 2 +- .../org/apache/ignite/cache/CacheManager.java | 2 + .../CacheDataStructuresManager.java | 5 +- .../distributed/dht/GridDhtCacheAdapter.java | 7 +- .../dht/GridPartitionedSingleGetFuture.java | 7 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 10 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 36 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 25 + .../distributed/near/GridNearAtomicCache.java | 3 + .../cache/query/GridCacheQueryRequest.java | 12 +- .../CacheSerializableTransactionsTest.java | 8 + .../cache/GridCacheAbstractFullApiSelfTest.java | 8 + ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 1 + ...ntNodeBinaryObjectMetadataMultinodeTest.java | 8 +- ...gniteAtomicLongChangingTopologySelfTest.java | 8 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 - ...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 - .../near/NearCacheSyncUpdateTest.java | 167 ++ .../GridCacheRebalancingSyncSelfTest.java | 12 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 30 +- ...CommunicationRecoveryAckClosureSelfTest.java | 39 +- .../testsuites/IgniteCacheTestSuite2.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 6 + modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- modules/platforms/dotnet/dotnet.dxg | 1795 ------------------ .../cache/IgnitePutGetBatchBenchmark.java | 15 +- .../cache/IgnitePutGetTxBatchBenchmark.java | 15 +- 28 files changed, 361 insertions(+), 1875 deletions(-) ----------------------------------------------------------------------
