Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05f69a6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05f69a6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05f69a6a Branch: refs/heads/ignite-752 Commit: 05f69a6a6beec9fdc9f9ea5f08eaee91a523edcf Parents: ac4c9f7 cf08181 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Jul 20 13:17:41 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Jul 20 13:17:41 2015 +0300 ---------------------------------------------------------------------- .../ignite/compute/ComputeJobResultPolicy.java | 3 +- .../failover/GridFailoverContextImpl.java | 28 ++- .../managers/failover/GridFailoverManager.java | 13 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/IgniteInternalCache.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 9 +- .../processors/closure/AffinityTask.java | 35 ++++ .../closure/GridClosureProcessor.java | 63 ++++++- .../processors/task/GridTaskWorker.java | 24 ++- .../ignite/internal/util/IgniteUtils.java | 8 +- .../ignite/spi/failover/FailoverContext.java | 18 ++ .../spi/failover/always/AlwaysFailoverSpi.java | 25 +++ .../IgniteClientReconnectFailoverTest.java | 47 +++-- .../cache/CacheAffinityCallSelfTest.java | 172 +++++++++++++++++++ .../cache/GridCacheAffinityRoutingSelfTest.java | 157 ++++++++++++++++- .../cache/IgniteCacheNearLockValueSelfTest.java | 2 + .../IgniteCachePutRetryAbstractSelfTest.java | 52 ++++-- ...gniteCachePutRetryTransactionalSelfTest.java | 17 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../spi/failover/GridFailoverTestContext.java | 10 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../ignite/schema/ui/SchemaImportApp.java | 36 +++- 24 files changed, 650 insertions(+), 83 deletions(-) ----------------------------------------------------------------------
