cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 25 Aug 2015 12:45:11 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/90a95582
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90a95582
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90a95582

Branch: refs/heads/trunk
Commit: 90a95582af91a8c0dec3395df5f3ef6c5e060478
Parents: 676054a d96d175
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Aug 25 14:45:02 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Aug 25 14:45:02 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 58 +++++++++-----------
 .../cassandra/thrift/CassandraServer.java       | 17 +++---
 3 files changed, 35 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90a95582/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f0d1d66,14f48cb..5921c15
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-beta2
+  * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
   * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
   * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
   * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)


Mime
View raw message