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 2015/05/08 19:08:51 UTC

[1/3] cassandra git commit: clarify 6757/7027 relationship

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 135151e53 -> ef8dc6715
  refs/heads/trunk f45e4a556 -> 86f481ef9


clarify 6757/7027 relationship


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

Branch: refs/heads/cassandra-2.1
Commit: ef8dc6715655c3d37583f2f6477b71449809ec55
Parents: 135151e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 12:08:36 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 12:08:36 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef8dc671/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 37f0117..2b7a355 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -779,7 +779,7 @@ Merged from 1.2:
  * Fix broken paging state with prepared statement (CASSANDRA-7120)
  * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
  * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
- * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
+ * Add Thrift MultiSliceRequest (CASSANDRA-6757, CASSANDRA-7027)
  * Handle overlapping MultiSlices (CASSANDRA-7279)
  * Fix DataOutputTest on Windows (CASSANDRA-7265)
  * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)

[2/3] cassandra git commit: clarify 6757/7027 relationship

Posted by jb...@apache.org.
clarify 6757/7027 relationship


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

Branch: refs/heads/trunk
Commit: ef8dc6715655c3d37583f2f6477b71449809ec55
Parents: 135151e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 12:08:36 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 12:08:36 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef8dc671/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 37f0117..2b7a355 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -779,7 +779,7 @@ Merged from 1.2:
  * Fix broken paging state with prepared statement (CASSANDRA-7120)
  * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
  * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
- * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
+ * Add Thrift MultiSliceRequest (CASSANDRA-6757, CASSANDRA-7027)
  * Handle overlapping MultiSlices (CASSANDRA-7279)
  * Fix DataOutputTest on Windows (CASSANDRA-7265)
  * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)

[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 86f481ef93bc35649c77fd26ad6da337fc54db6a
Parents: f45e4a5 ef8dc67
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 12:08:46 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 12:08:46 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86f481ef/CHANGES.txt
----------------------------------------------------------------------