merge from 1.2

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

Branch: refs/heads/trunk
Commit: 69c9e031ee1aa8b96f29ac47ab5e8b79b5c2ac0f
Parents: 7f117da 8cc28a1
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Thu Sep 12 13:22:00 2013 +0200
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Thu Sep 12 13:22:00 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/db/HintedHandOffManager.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69c9e031/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 68829d8,6ece609..6807039
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -1.2.10
 +2.0.1
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data 
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 +Merged from 1.2:
+  * Fix possible divide-by-zero in HHOM (CASSANDRA-5990)
   * Allow local batchlog writes for CL.ANY (CASSANDRA-5967)
   * Optimize name query performance in wide rows (CASSANDRA-5966)
   * Upgrade metrics-core to version 2.2.0 (CASSANDRA-5947)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69c9e031/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------

Reply via email to