[1/2] cassandra git commit: Fix SSTableImportTest

2014-11-25 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/trunk 395720c37 - 7eea53e5d


Fix SSTableImportTest

patch by blerer; reviewed by azotcsit for CASSANDRA-8181


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

Branch: refs/heads/trunk
Commit: e0dff2b808789c4c2a0751d00eff3e3d066c87dc
Parents: 2943684
Author: Benjamin Lerer benjamin.le...@datastax.com
Authored: Tue Nov 25 11:03:44 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 25 11:04:54 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/e0dff2b8/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java 
b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index 38e5914..b0f4c0a 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -156,6 +156,7 @@ public class SSTableImportTest extends SchemaLoader
 // Import JSON to temp SSTable file
 String jsonUrl = resourcePath(SimpleCF.json);
 File tempSS = tempSSTableFile(Keyspace1, AsciiKeys);
+System.setProperty(skip.key.validator, false);
 new SSTableImport(true).importJson(jsonUrl, Keyspace1, AsciiKeys, 
tempSS.getPath());
 
 // Verify results



cassandra git commit: Fix SSTableImportTest

2014-11-25 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 29436845f - e0dff2b80


Fix SSTableImportTest

patch by blerer; reviewed by azotcsit for CASSANDRA-8181


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

Branch: refs/heads/cassandra-2.1
Commit: e0dff2b808789c4c2a0751d00eff3e3d066c87dc
Parents: 2943684
Author: Benjamin Lerer benjamin.le...@datastax.com
Authored: Tue Nov 25 11:03:44 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 25 11:04:54 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/e0dff2b8/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
--
diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java 
b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
index 38e5914..b0f4c0a 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java
@@ -156,6 +156,7 @@ public class SSTableImportTest extends SchemaLoader
 // Import JSON to temp SSTable file
 String jsonUrl = resourcePath(SimpleCF.json);
 File tempSS = tempSSTableFile(Keyspace1, AsciiKeys);
+System.setProperty(skip.key.validator, false);
 new SSTableImport(true).importJson(jsonUrl, Keyspace1, AsciiKeys, 
tempSS.getPath());
 
 // Verify results