ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/3] ignite git commit: IGNITE-3247: IGFS: Minor fixes after merge.
Date Mon, 06 Jun 2016 10:04:51 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 919e28a77 -> 38ac8fb42


IGNITE-3247: IGFS:  Minor fixes after merge.


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

Branch: refs/heads/master
Commit: 3d3bf080bbb5d5a35a9a6cb641a7b1b11867b538
Parents: 6f99b14
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Jun 6 10:36:26 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Jun 6 10:36:26 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/igfs/IgfsAbstractSelfTest.java    | 3 ++-
 .../java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3d3bf080/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 48d6d98..001868f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -288,7 +288,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest
{
         for (int i = 0; i < nodes.length; i++) {
             String nodeName = i == 0 ? "ignite" : "ignite" + i;
 
-            nodes[i] = startGridWithIgfs(nodeName, "igfs", mode, igfsSecondaryFileSystem,
PRIMARY_REST_CFG, ipFinder);
+            nodes[i] = startGridWithIgfs(nodeName, "igfs", mode, igfsSecondaryFileSystem,
PRIMARY_REST_CFG,
+                primaryIpFinder);
         }
 
         igfs = (IgfsImpl) nodes[0].fileSystem("igfs");

http://git-wip-us.apache.org/repos/asf/ignite/blob/3d3bf080/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
index 3e80614..dc1379f 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
@@ -45,7 +45,7 @@ import org.apache.ignite.internal.processors.igfs.IgfsOneClientNodeTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOffheapTieredSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOffheapValuesSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimaryOptimziedMarshallerSelfTest;
-import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedClientSelfTest;
+import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyClientSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencyMultiNodeSelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimaryRelaxedConsistencySelfTest;
 import org.apache.ignite.internal.processors.igfs.IgfsPrimarySelfTest;
@@ -107,7 +107,7 @@ public class IgniteIgfsTestSuite extends TestSuite {
         suite.addTest(new TestSuite(IgfsMetricsSelfTest.class));
 
         suite.addTest(new TestSuite(IgfsPrimaryClientSelfTest.class));
-        suite.addTest(new TestSuite(IgfsPrimaryRelaxedClientSelfTest.class));
+        suite.addTest(new TestSuite(IgfsPrimaryRelaxedConsistencyClientSelfTest.class));
         suite.addTest(new TestSuite(IgfsDualSyncClientSelfTest.class));
         suite.addTest(new TestSuite(IgfsDualAsyncClientSelfTest.class));
 


Mime
View raw message