Merge remote-tracking branch 'remotes/origin/master' into ignite-1329
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e4a3de1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e4a3de1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e4a3de1 Branch: refs/heads/ignite-1329 Commit: 1e4a3de1b5b571eb2721e6a55bccc3c2459c1dd3 Parents: 1f64771 c6bb01b Author: sboikov <[email protected]> Authored: Tue Sep 29 09:34:32 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Sep 29 09:34:32 2015 +0300 ---------------------------------------------------------------------- bin/igniterouter.bat | 2 +- bin/igniterouter.sh | 2 +- .../computegrid/ComputeClosureExample.java | 2 +- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 2 +- .../cache/DynamicCacheChangeRequest.java | 19 ++ .../cache/DynamicCacheDescriptor.java | 19 ++ .../cache/GridCacheExplicitLockSpan.java | 13 +- .../cache/GridCacheMvccCandidate.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 47 ++-- .../GridCachePartitionExchangeManager.java | 20 +- .../processors/cache/GridCacheProcessor.java | 15 +- .../distributed/GridDistributedCacheEntry.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/colocated/GridDhtColocatedCache.java | 12 +- .../colocated/GridDhtColocatedLockFuture.java | 16 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../near/GridNearTxFinishFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../cache/local/GridLocalCacheEntry.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 10 +- .../transactions/IgniteTxLocalAdapter.java | 35 ++- .../continuous/GridContinuousProcessor.java | 17 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../internal/GridUpdateNotifierSelfTest.java | 1 + .../processors/cache/CrossCacheLockTest.java | 142 +++++++++++ .../GridCacheFinishPartitionsSelfTest.java | 5 +- .../cache/IgniteDynamicCacheFilterTest.java | 150 +++++++++++ .../IgniteTxExceptionAbstractSelfTest.java | 3 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 +- ...nedQueueFailoverDataConsistencySelfTest.java | 5 - .../IgniteTxPreloadAbstractTest.java | 43 ++-- .../GridCacheColocatedTxExceptionSelfTest.java | 5 - .../near/GridCacheNearTxExceptionSelfTest.java | 5 - .../GridCacheReplicatedInvalidateSelfTest.java | 249 ------------------- .../GridCacheReplicatedTxExceptionSelfTest.java | 5 - .../replicated/GridReplicatedTxPreloadTest.java | 2 - ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../GridCacheLocalTxExceptionSelfTest.java | 5 - .../IgniteCacheFailoverTestSuite3.java | 5 +- .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 13 + pom.xml | 26 +- 45 files changed, 576 insertions(+), 404 deletions(-) ----------------------------------------------------------------------
