IGNITE-109 - Merge branch 'ignite-109' into sprint-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/9550905e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9550905e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9550905e Branch: refs/heads/ignite-71 Commit: 9550905e62dad06717ab666330c1d5b6523adc02 Parents: 61a9f98 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Jan 29 19:04:43 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Jan 29 19:04:43 2015 -0800 ---------------------------------------------------------------------- .../cache/distributed/IgniteCrossCacheTxStoreSelfTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9550905e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java index 7df7619..f80549c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java @@ -108,7 +108,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testWriteThrough() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); TestStore firstStore = (TestStore)grid(0).configuration().getCacheConfiguration()[1].getCacheStoreFactory().create(); @@ -153,7 +153,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIncompatibleCaches1() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); try (IgniteTx ignored = grid.transactions().txStart()) { GridCache<Object, Object> cacheA = grid.cache("cacheA"); @@ -174,7 +174,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIncompatibleCaches2() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); try (IgniteTx ignored = grid.transactions().txStart()) { GridCache<Object, Object> cacheA = grid.cache("cacheA");
