cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Tue, 04 Oct 2016 13:15:56 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 353bfddece99de31f2f0d341b2a832ddae542696
Parents: fb22761 033f256
Author: Robert Stupp <snazy@snazy-ds15.fritz.box>
Authored: Tue Oct 4 14:40:59 2016 +0200
Committer: Robert Stupp <snazy@snazy-ds15.fritz.box>
Committed: Tue Oct 4 14:40:59 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/RowIndexEntry.java  | 35 ++++----------------
 .../io/sstable/LargePartitionsTest.java         | 22 ++++++++++--
 3 files changed, 27 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/353bfdde/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index af78f3e,64743b4..724bdb1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +4.0
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 +
  3.10
+  * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
   * ColumnIndex does not reuse buffer (CASSANDRA-12502)
   * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
   * Upgrade metrics-reporter dependencies (CASSANDRA-12089)


Mime
View raw message