cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 14 Aug 2015 14:27:25 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 7b026964b86ce07447e7904ab0286d40a203f0c6
Parents: 8b7caa1 23826f7
Author: T Jake Luciani <jake@apache.org>
Authored: Fri Aug 14 10:26:31 2015 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Fri Aug 14 10:26:31 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b026964/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fae0cfc,6a9dc1e..e7cc12e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -2.2.1
 +3.0.0-beta1
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 +Merged from 2.2:
+  * Fix histogram overflow exception (CASSANDRA-9973)
   * Route gossip messages over dedicated socket (CASSANDRA-9237)
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)


Mime
View raw message