cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 07 Oct 2015 21:56:40 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/39714521
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39714521
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39714521

Branch: refs/heads/trunk
Commit: 397145219727e0651db3102b7837146c3e8dfad1
Parents: dc6f5bd 9415c84
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Oct 7 16:54:31 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Oct 7 16:54:31 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java | 6 ------
 .../cassandra/io/sstable/CQLSSTableWriterClientTest.java       | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39714521/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 16958a1,72c09d3..b819e11
--- 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
+  * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
   * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
   * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
   * Provide additional metrics for materialized views (CASSANDRA-10323)


Mime
View raw message