cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 07 Jan 2016 17:43:28 GMT
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/24630b4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24630b4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24630b4a

Branch: refs/heads/trunk
Commit: 24630b4a1fcfe8fc7fdb228a3f87f153905b519f
Parents: b477c0f 52d8197
Author: T Jake Luciani <jake@apache.org>
Authored: Thu Jan 7 12:28:00 2016 -0500
Committer: T Jake Luciani <jake@apache.org>
Committed: Thu Jan 7 12:28:00 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 .../apache/cassandra/metrics/EstimatedHistogramReservoir.java   | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/24630b4a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1533619,a26f9e0..7f6b761
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.2.5
 +3.0.3
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * 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:
+  * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
   * Enable GC logging by default (CASSANDRA-10140)
   * Optimize pending range computation (CASSANDRA-9258)
   * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)


Mime
View raw message