Merge branch 'cassandra-2.0' into cassandra-2.1
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/d69728f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d69728f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d69728f8
Branch: refs/heads/cassandra-2.1
Commit: d69728f8a5297e3e91415ee35689e54120797977
Parents: 7fa0341 77df557
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Dec 9 21:10:35 2014 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Dec 9 21:10:35 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/exceptions/UnavailableException.java | 7 ++++++-
.../org/apache/cassandra/service/StorageProxy.java | 14 +++++++++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d69728f8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 28dd6b4,3c651ff..3545afc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
-2.0.12:
+2.1.3
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries
(CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)
* Throw correct exception when trying to bind a keyspace or table
name (CASSANDRA-6952)
* Make HHOM.compact synchronized (CASSANDRA-8416)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d69728f8/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
