ignite-4535 : Conflicts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a49fa5d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a49fa5d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a49fa5d Branch: refs/heads/ignite-3477-master Commit: 7a49fa5d4be9970af93ef662abc84d0538638717 Parents: 5ec807a Author: Ilya Lantukh <[email protected]> Authored: Thu Mar 30 16:10:26 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Thu Mar 30 16:10:26 2017 +0300 ---------------------------------------------------------------------- .../ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7a49fa5d/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java index 5b800f7..84e7953 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDa import org.apache.ignite.internal.processors.cache.datastructures.IgniteClientDiscoveryDataStructuresTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureUniqueNameTest; import org.apache.ignite.internal.processors.cache.datastructures.IgniteDataStructureWithJobTest; -import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicOffheapSetSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicQueueApiSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalAtomicSetSelfTest; import org.apache.ignite.internal.processors.cache.datastructures.local.GridCacheLocalQueueApiSelfTest;
