You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/09/29 11:19:05 UTC
[2/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-3479' into ignite-3479
Merge remote-tracking branch 'origin/ignite-3479' into ignite-3479
# Conflicts:
# modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3332ae7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3332ae7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3332ae7
Branch: refs/heads/ignite-3479
Commit: c3332ae7aacac90bda07ef5bccd47dbe7414a658
Parents: 84b9174 d86ab34
Author: sboikov <sb...@gridgain.com>
Authored: Fri Sep 29 14:17:36 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Sep 29 14:17:36 2017 +0300
----------------------------------------------------------------------
.../cache/mvcc/CacheCoordinatorsProcessor.java | 30 +++-
.../cache/mvcc/CacheMvccTransactionsTest.java | 136 +++++++++++++++++--
2 files changed, 149 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c3332ae7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
index 7799c88,1b70747..a33ed55
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
@@@ -56,6 -57,7 +57,8 @@@ import org.apache.ignite.internal.util.
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.X;
++import org.apache.ignite.internal.util.typedef.X;
+ import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiInClosure;