You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2016/06/27 16:14:03 UTC
[1/3] cassandra git commit: backport fix for flaky
testExportColumnsWithMetadata from 2.2
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9358e589e -> 341b3fbfb
refs/heads/cassandra-2.2 5d0d30e4d -> 6fcf3353b
backport fix for flaky testExportColumnsWithMetadata from 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/341b3fbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/341b3fbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/341b3fbf
Branch: refs/heads/cassandra-2.1
Commit: 341b3fbfb444bc0af81700cdc5a30d5bafea04a1
Parents: 9358e58
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 27 11:13:48 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 27 11:13:48 2016 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/tools/SSTableExportTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/341b3fbf/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index c918d6a..16f4bda 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -296,10 +296,9 @@ public class SSTableExportTest extends SchemaLoader
JSONObject serializedDeletionInfo = (JSONObject) meta.get("deletionInfo");
assertNotNull("expecing deletionInfo to be present", serializedDeletionInfo);
- assertEquals(
- "unexpected serialization format for topLevelDeletion",
- "{\"markedForDeleteAt\":0,\"localDeletionTime\":0}",
- serializedDeletionInfo.toJSONString());
+ assertEquals("unexpected serialization format for topLevelDeletion",
+ JSONValue.parse("{\"markedForDeleteAt\":0,\"localDeletionTime\":0}"),
+ serializedDeletionInfo);
// check the colums are what we put in
JSONArray cols = (JSONArray) row.get("cells");
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fcf3353
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fcf3353
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fcf3353
Branch: refs/heads/cassandra-2.2
Commit: 6fcf3353b65195f0b1d0c1e20c5b8d562a8d21d5
Parents: 5d0d30e 341b3fb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 27 11:13:56 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 27 11:13:56 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] cassandra git commit: backport fix for flaky
testExportColumnsWithMetadata from 2.2
Posted by jb...@apache.org.
backport fix for flaky testExportColumnsWithMetadata from 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/341b3fbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/341b3fbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/341b3fbf
Branch: refs/heads/cassandra-2.2
Commit: 341b3fbfb444bc0af81700cdc5a30d5bafea04a1
Parents: 9358e58
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 27 11:13:48 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 27 11:13:48 2016 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/tools/SSTableExportTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/341b3fbf/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index c918d6a..16f4bda 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -296,10 +296,9 @@ public class SSTableExportTest extends SchemaLoader
JSONObject serializedDeletionInfo = (JSONObject) meta.get("deletionInfo");
assertNotNull("expecing deletionInfo to be present", serializedDeletionInfo);
- assertEquals(
- "unexpected serialization format for topLevelDeletion",
- "{\"markedForDeleteAt\":0,\"localDeletionTime\":0}",
- serializedDeletionInfo.toJSONString());
+ assertEquals("unexpected serialization format for topLevelDeletion",
+ JSONValue.parse("{\"markedForDeleteAt\":0,\"localDeletionTime\":0}"),
+ serializedDeletionInfo);
// check the colums are what we put in
JSONArray cols = (JSONArray) row.get("cells");