ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject ignite git commit: Merge branch 'master' of github.com:ggprivate/ggprivate into ignite-1.4-slow-server-debug
Date Mon, 26 Oct 2015 13:37:15 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.4-slow-server-debug 523e689eb -> 0c11727fd


Merge branch 'master' of github.com:ggprivate/ggprivate into ignite-1.4-slow-server-debug

Conflicts:
	parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c11727f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c11727f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c11727f

Branch: refs/heads/ignite-1.4-slow-server-debug
Commit: 0c11727fd95c098b82bfd7d779ef7629e7ef0e49
Parents: 523e689
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Mon Oct 26 16:36:50 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Mon Oct 26 16:36:50 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMissingCommitVersionSelfTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c11727f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
index 6a0b9ad..891f257 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java
@@ -129,4 +129,4 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes
             fail("Put failed to finish in 5s.");
         }
     }
-}
\ No newline at end of file
+}


Mime
View raw message