Repository: ignite Updated Branches: refs/heads/ignite-8446 fa1a33ec6 -> dd3e51149
Merge branch 'ignite-8446-master' into ignite-8446 Signed-off-by: Anton Vinogradov <a...@apache.org> # Conflicts: # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd3e5114 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd3e5114 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd3e5114 Branch: refs/heads/ignite-8446 Commit: dd3e51149ae3198f5659bb2085c352dbed75e10e Parents: fa1a33e Author: Anton Vinogradov <a...@apache.org> Authored: Fri Aug 3 12:58:21 2018 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Fri Aug 3 12:58:21 2018 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd3e5114/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java index 0b259f9..4af9e1f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java @@ -46,7 +46,6 @@ import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTime import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTopologyChangeTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnIncorrectParamsTest; import org.apache.ignite.internal.processors.cache.transactions.TxStateChangeEventTest; -import org.apache.ignite.internal.processors.cache.transactions.TxWithSmallTimeoutAndContentionOneKeyTest; import org.apache.ignite.testframework.junits.GridAbstractTest; /**
