You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/12/31 18:14:18 UTC
[1/3] cassandra git commit: Do not reference HintsService from test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 3d78939a8 -> 7f6d039f9
refs/heads/trunk bcbb53b7d -> e8d3c9eae
Do not reference HintsService from test
patch by yukim; reviewed by snazy for CASSANDRA-10950
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f6d039f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f6d039f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f6d039f
Branch: refs/heads/cassandra-3.0
Commit: 7f6d039f9b81d681a3d3975335ec32b8b3cef934
Parents: 3d78939
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 29 11:24:19 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 11:13:02 2015 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/hints/HintsCatalogTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f6d039f/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
index 73fd040..51b6aa3 100644
--- a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.*;
+import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import static junit.framework.Assert.*;
@@ -62,7 +63,7 @@ public class HintsCatalogTest
writeDescriptor(directory, descriptor3);
writeDescriptor(directory, descriptor4);
- HintsCatalog catalog = HintsCatalog.load(directory, HintsService.EMPTY_PARAMS);
+ HintsCatalog catalog = HintsCatalog.load(directory, ImmutableMap.of());
assertEquals(2, catalog.stores().count());
HintsStore store1 = catalog.get(hostId1);
[2/3] cassandra git commit: Do not reference HintsService from test
Posted by yu...@apache.org.
Do not reference HintsService from test
patch by yukim; reviewed by snazy for CASSANDRA-10950
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f6d039f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f6d039f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f6d039f
Branch: refs/heads/trunk
Commit: 7f6d039f9b81d681a3d3975335ec32b8b3cef934
Parents: 3d78939
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 29 11:24:19 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 11:13:02 2015 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/hints/HintsCatalogTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f6d039f/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
index 73fd040..51b6aa3 100644
--- a/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsCatalogTest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.*;
+import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import static junit.framework.Assert.*;
@@ -62,7 +63,7 @@ public class HintsCatalogTest
writeDescriptor(directory, descriptor3);
writeDescriptor(directory, descriptor4);
- HintsCatalog catalog = HintsCatalog.load(directory, HintsService.EMPTY_PARAMS);
+ HintsCatalog catalog = HintsCatalog.load(directory, ImmutableMap.of());
assertEquals(2, catalog.stores().count());
HintsStore store1 = catalog.get(hostId1);
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8d3c9ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8d3c9ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8d3c9ea
Branch: refs/heads/trunk
Commit: e8d3c9eaee706d4b181147f30c2d640f77ef9868
Parents: bcbb53b 7f6d039
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 31 11:14:04 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 31 11:14:04 2015 -0600
----------------------------------------------------------------------
test/unit/org/apache/cassandra/hints/HintsCatalogTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------