cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk
Date Fri, 16 Oct 2015 19:42:57 GMT
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/841e4854
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/841e4854
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/841e4854

Branch: refs/heads/trunk
Commit: 841e4854661354d32bd94762a72d292fc1553866
Parents: dec7659 5d6455f
Author: blerer <benjamin.lerer@datastax.com>
Authored: Fri Oct 16 21:42:04 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Fri Oct 16 21:42:14 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 NEWS.txt                                          | 2 +-
 src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/841e4854/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 801b2fb,33c360e..725cc9f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes (CASSANDRA-10473)
   * Remove circular references in SegmentedFile (CASSANDRA-10543)
   * Ensure validation of indexed values only occurs once per-partition (CASSANDRA-10536)
   * Fix handling of static columns for range tombstones in thrift (CASSANDRA-10174)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/841e4854/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------


Mime
View raw message