You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/02/12 00:16:53 UTC
[3/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/c5f225bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f225bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5f225bd
Branch: refs/heads/trunk
Commit: c5f225bd6bd85250ed8025720ba77b2a6d6be061
Parents: b0e4f00 cf6b488
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 11 17:13:52 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 11 17:13:52 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 12 ++++++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f225bd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index aec6f5e,1bd9c6e..fd640cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-1.2.16
+2.0.6
+ * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
+ * Fix EstimatedHistogram races (CASSANDRA-6682)
+ * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
+ * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
+ * Expose bulk loading progress over JMX (CASSANDRA-4757)
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
+ * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
+ * Make commitlog failure handling configurable (CASSANDRA-6364)
+Merged from 1.2:
+ * Fix broken streams when replacing with same IP (CASSANDRA-6622)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
* Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f225bd/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------