Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72b91c18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72b91c18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72b91c18 Branch: refs/heads/ignite-1121 Commit: 72b91c180e52ca1cf962bc1344335d1282d9a060 Parents: 9fdb28c f9d2a2e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 20 11:40:22 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 20 11:40:22 2015 +0300 ---------------------------------------------------------------------- .../ignite/compute/ComputeJobResultPolicy.java | 3 +- .../failover/GridFailoverContextImpl.java | 28 ++- .../managers/failover/GridFailoverManager.java | 13 +- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/closure/AffinityTask.java | 35 ++++ .../closure/GridClosureProcessor.java | 63 ++++++- .../processors/task/GridTaskWorker.java | 24 ++- .../ignite/internal/util/IgniteUtils.java | 4 +- .../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 + .../spi/failover/GridFailoverTestContext.java | 10 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../ignite/schema/ui/SchemaImportApp.java | 36 +++- 17 files changed, 594 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
