cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: e37efea670fa80d00e4edca419a16560c80f6daf
Parents: 4acd4bb b8172dc
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Aug 25 16:38:01 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Aug 25 16:38:01 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e37efea6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4350a46,4a3dc02..5a84d63
--- 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 double flushing of secondary index tables (CASSANDRA-10180)
   * 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)


Mime
View raw message