You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/05 15:29:09 UTC
[15/20] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4e3f084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4e3f084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4e3f084
Branch: refs/heads/trunk
Commit: a4e3f08471fa21ff419c04140a59e95dbad032f3
Parents: 5ad8010 e0c1b0b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:27:12 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:27:12 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/locator/PendingRangeMaps.java | 209 +++++++++++++++++++
.../test/microbench/PendingRangesBench.java | 89 ++++++++
.../cassandra/locator/PendingRangeMapsTest.java | 78 +++++++
4 files changed, 377 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4e3f084/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 23edbbf,648200b..4b5610e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.2.5
+3.0.3
+ * Fix potential assertion error during compaction (CASSANDRA-10944)
+ * Fix counting of received sstables in streaming (CASSANDRA-10949)
+ * Implement hints compression (CASSANDRA-9428)
+ * Fix potential assertion error when reading static columns (CASSANDRA-10903)
+ * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
+ * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
+ * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
+ * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
+ * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
+Merged from 2.2:
+ * Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
* jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)