You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/18 12:18:31 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 098963bc0 -> d2c35503c
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2c35503
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2c35503
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2c35503
Branch: refs/heads/ignite-1537
Commit: d2c35503c0d2ef44d1baea4e84706e3e79bbf1be
Parents: 098963b
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 14:18:23 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 14:18:23 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/IgniteCachePutAllRestartTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d2c35503/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
index 3e124f3..96a396c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
@@ -121,7 +121,7 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest {
iter++;
- if (iter % 10 == 0)
+ if (iter % 1000 == 0)
log.info("Iteration: " + iter);
}