Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7eea53e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7eea53e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7eea53e5
Branch: refs/heads/trunk
Commit: 7eea53e5d164fa48f9ddd97ecc92361d3d522ce4
Parents: 395720c e0dff2b
Author: Sylvain Lebresne <[email protected]>
Authored: Tue Nov 25 11:05:48 2014 +0100
Committer: Sylvain Lebresne <[email protected]>
Committed: Tue Nov 25 11:05:48 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/tools/SSTableImportTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eea53e5/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index e2cecb2,b0f4c0a..eb5fb28
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@@ -187,8 -155,9 +187,9 @@@ public class SSTableImportTes
{
// Import JSON to temp SSTable file
String jsonUrl = resourcePath("SimpleCF.json");
- File tempSS = tempSSTableFile("Keyspace1", "AsciiKeys");
+ File tempSS = tempSSTableFile(KEYSPACE1, "AsciiKeys");
+ System.setProperty("skip.key.validator", "false");
- new SSTableImport(true).importJson(jsonUrl, "Keyspace1", "AsciiKeys",
tempSS.getPath());
+ new SSTableImport(true).importJson(jsonUrl, KEYSPACE1, "AsciiKeys",
tempSS.getPath());
// Verify results
SSTableReader reader =
SSTableReader.open(Descriptor.fromFilename(tempSS.getPath()));
