You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 10:26:22 UTC
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-961-master
Merge remote-tracking branch 'remotes/origin/master' into ignite-961-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c80e649c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c80e649c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c80e649c
Branch: refs/heads/ignite-961-master
Commit: c80e649cb6e3e7cae4f260e19fa3eab31f2d2803
Parents: 952ac72 f9d2a2e
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 11:26:07 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 11:26:07 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(-)
----------------------------------------------------------------------