You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/19 23:15:31 UTC
[01/10] git commit: Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 5e40a3b7c -> b68493751
refs/heads/cassandra-2.0 a21251654 -> c0ff52e5b
refs/heads/cassandra-2.1 ce7bc6a84 -> ddaddf636
refs/heads/trunk 22ab0264c -> 916e57b4a
Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6849375
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6849375
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6849375
Branch: refs/heads/cassandra-1.2
Commit: b6849375151f79d0aa708a990dc9daef567dfcb5
Parents: 5e40a3b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:14:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:14:32 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 51dec14..11fcf18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ec8c7c3..6611ba9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -566,7 +566,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
flushes.add(cfs.forceFlush());
}
}
- FBUtilities.waitOnFutures(flushes);
+ try
+ {
+ FBUtilities.waitOnFutures(flushes);
+ }
+ catch (Throwable e)
+ {
+ // don't let this stop us from shutting down the commitlog and other thread pools
+ logger.warn("Caught exception while waiting for memtable flushes during shutdown hook", e);
+ }
CommitLog.instance.shutdownBlocking();
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/916e57b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/916e57b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/916e57b4
Branch: refs/heads/trunk
Commit: 916e57b4a192b0a7abbf4041af8c51a2c4860099
Parents: 22ab026 ddaddf6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:15:25 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:15:25 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[04/10] git commit: Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Posted by jb...@apache.org.
Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6849375
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6849375
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6849375
Branch: refs/heads/trunk
Commit: b6849375151f79d0aa708a990dc9daef567dfcb5
Parents: 5e40a3b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:14:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:14:32 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 51dec14..11fcf18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ec8c7c3..6611ba9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -566,7 +566,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
flushes.add(cfs.forceFlush());
}
}
- FBUtilities.waitOnFutures(flushes);
+ try
+ {
+ FBUtilities.waitOnFutures(flushes);
+ }
+ catch (Throwable e)
+ {
+ // don't let this stop us from shutting down the commitlog and other thread pools
+ logger.warn("Caught exception while waiting for memtable flushes during shutdown hook", e);
+ }
CommitLog.instance.shutdownBlocking();
[07/10] git commit: merge from 1.2
Posted by jb...@apache.org.
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/c0ff52e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0ff52e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0ff52e5
Branch: refs/heads/trunk
Commit: c0ff52e5b4e19be0a8a594942b0e9c7e454e1735
Parents: a212516 b684937
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:15:10 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:15:10 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 83b03de,11fcf18..4fffb9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,7 +1,25 @@@
-1.2.16
+2.0.6
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * 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)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+Merged from 1.2:
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[05/10] git commit: merge from 1.2
Posted by jb...@apache.org.
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/c0ff52e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0ff52e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0ff52e5
Branch: refs/heads/cassandra-2.1
Commit: c0ff52e5b4e19be0a8a594942b0e9c7e454e1735
Parents: a212516 b684937
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:15:10 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:15:10 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 83b03de,11fcf18..4fffb9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,7 +1,25 @@@
-1.2.16
+2.0.6
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * 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)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+Merged from 1.2:
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[02/10] git commit: Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Posted by jb...@apache.org.
Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6849375
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6849375
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6849375
Branch: refs/heads/cassandra-2.0
Commit: b6849375151f79d0aa708a990dc9daef567dfcb5
Parents: 5e40a3b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:14:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:14:32 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 51dec14..11fcf18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ec8c7c3..6611ba9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -566,7 +566,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
flushes.add(cfs.forceFlush());
}
}
- FBUtilities.waitOnFutures(flushes);
+ try
+ {
+ FBUtilities.waitOnFutures(flushes);
+ }
+ catch (Throwable e)
+ {
+ // don't let this stop us from shutting down the commitlog and other thread pools
+ logger.warn("Caught exception while waiting for memtable flushes during shutdown hook", e);
+ }
CommitLog.instance.shutdownBlocking();
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddaddf63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddaddf63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddaddf63
Branch: refs/heads/trunk
Commit: ddaddf636c20a3b34a92c06a5f7a64d18e4171eb
Parents: ce7bc6a c0ff52e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:15:18 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:15:18 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddaddf63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddaddf63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddaddf63
Branch: refs/heads/cassandra-2.1
Commit: ddaddf636c20a3b34a92c06a5f7a64d18e4171eb
Parents: ce7bc6a c0ff52e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:15:18 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:15:18 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[03/10] git commit: Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Posted by jb...@apache.org.
Catch memtable flush exceptions during shutdown
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6735
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6849375
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6849375
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6849375
Branch: refs/heads/cassandra-2.1
Commit: b6849375151f79d0aa708a990dc9daef567dfcb5
Parents: 5e40a3b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:14:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:14:32 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 51dec14..11fcf18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.16
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
(CASSANDRA-6732)
* Fix broken streams when replacing with same IP (CASSANDRA-6622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6849375/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ec8c7c3..6611ba9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -566,7 +566,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
flushes.add(cfs.forceFlush());
}
}
- FBUtilities.waitOnFutures(flushes);
+ try
+ {
+ FBUtilities.waitOnFutures(flushes);
+ }
+ catch (Throwable e)
+ {
+ // don't let this stop us from shutting down the commitlog and other thread pools
+ logger.warn("Caught exception while waiting for memtable flushes during shutdown hook", e);
+ }
CommitLog.instance.shutdownBlocking();
[06/10] git commit: merge from 1.2
Posted by jb...@apache.org.
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/c0ff52e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0ff52e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0ff52e5
Branch: refs/heads/cassandra-2.0
Commit: c0ff52e5b4e19be0a8a594942b0e9c7e454e1735
Parents: a212516 b684937
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 19 16:15:10 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 19 16:15:10 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 83b03de,11fcf18..4fffb9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,7 +1,25 @@@
-1.2.16
+2.0.6
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * 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)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+Merged from 1.2:
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
- (CASSANDRA-6732)
* 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0ff52e5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------