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/05/08 11:43:38 UTC
[50/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/ignite-sprint-5' into ignite-460
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-460
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be1c801e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be1c801e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be1c801e
Branch: refs/heads/ignite-460
Commit: be1c801ee6f184212717e4327d1f5457a62740e3
Parents: a813124
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri May 8 12:42:03 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri May 8 12:42:03 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be1c801e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
index f7272d4..af38856 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -126,6 +126,8 @@ public class IgniteCacheTestSuite4 extends TestSuite {
suite.addTestSuite(CacheNoValueClassOnServerNodeTest.class);
+ suite.addTestSuite(CacheMapEntrySelfTest.class);
+
return suite;
}
}