Merge branch ignite-sprint-3 into ignite-674
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e3e6d09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e3e6d09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e3e6d09 Branch: refs/heads/ignite-674 Commit: 0e3e6d0961ca9568144a2831f25781f6920dfc7b Parents: 68eacf8 Author: Alexey Goncharuk <[email protected]> Authored: Fri Apr 3 15:45:36 2015 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Apr 3 15:45:36 2015 -0700 ---------------------------------------------------------------------- .../cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e3e6d09/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java index 9aa89be..143caf8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java @@ -58,7 +58,6 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest { CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setName(CACHE_NAME); - ccfg.setDefaultTimeToLive(120000); ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL); ccfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.PRIMARY_SYNC); ccfg.setBackups(2);
