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/36608cef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36608cef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36608cef

Branch: refs/heads/trunk
Commit: 36608cefa3470da7aa70a4c3de32d4ed3c3eed3e
Parents: fe62557 f9ac657
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Dec 29 15:34:06 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Dec 29 15:34:06 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36608cef/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b1a556a,23d6bae..837a592
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 -2.2.5
 +3.0.3
 + * 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-1837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 - * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
   * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)

Reply via email to