Merge branch 'ignite-2.0' into ignite-4565-ddl

# Conflicts:
#       
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
#       
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe340733
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe340733
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe340733

Branch: refs/heads/ignite-4565-ddl
Commit: fe34073337fc9f15646f0d6764b26f1e0c47281b
Parents: 1370549 837bae6
Author: devozerov <voze...@gridgain.com>
Authored: Mon Mar 20 10:45:22 2017 +0300
Committer: devozerov <voze...@gridgain.com>
Committed: Mon Mar 20 10:45:22 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/IgniteComputeImpl.java      | 13 ++++----
 .../failover/GridFailoverContextImpl.java       | 11 ------
 .../managers/failover/GridFailoverManager.java  |  3 --
 .../GridCachePartitionExchangeManager.java      |  2 +-
 .../processors/closure/AffinityTask.java        |  6 ----
 .../closure/GridClosureProcessor.java           | 35 +++-----------------
 .../processors/task/GridTaskWorker.java         |  7 +---
 .../ignite/spi/failover/FailoverContext.java    | 10 ------
 .../spi/failover/GridFailoverTestContext.java   |  7 +---
 .../Interop/IPlatformTarget.cs                  |  1 -
 10 files changed, 13 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


Reply via email to