ignite-53: merge from ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aca475f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aca475f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aca475f0 Branch: refs/heads/ignite-49 Commit: aca475f0729690a0bfb8bc2a7cf74b15be668022 Parents: 05b3295 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 19 13:44:13 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 19 13:44:13 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aca475f0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 9e4a368..849e4fc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -23,9 +23,9 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.swapspace.inmemory.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.apache.ignite.spi.swapspace.inmemory.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; @@ -42,12 +42,12 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePeekMode.*; +import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.transactions.IgniteTxState.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.gridgain.grid.cache.GridCachePeekMode.*; import static org.gridgain.testframework.GridTestUtils.*; /**
