[3/4] cassandra git commit: Update changes for backport

[br...@apache.org]

Update changes for backport


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

Branch: refs/heads/trunk
Commit: 27c2088e6159220aad9e2bbf6fc7cd733d1828d7
Parents: 68b2d28
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 12 18:40:15 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 12 18:40:15 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27c2088e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e4956c9..e99799d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,6 @@
  * Don't start Thrift rpc by default (CASSANDRA-9319)
  * Only stream from unrepaired sstables with incremental repair (CASSANDRA-8267)
  * Aggregate UDFs allow SFUNC return type to differ from STYPE if FFUNC specified (CASSANDRA-9321)
- * Failure detector detects and ignores local pauses (CASSANDRA-9183)
  * Remove Thrift dependencies in bundled tools (CASSANDRA-8358)
  * Disable memory mapping of hsperfdata file for JVM statistics (CASSANDRA-9242)
  * Add pre-startup checks to detect potential incompatibilities (CASSANDRA-8049)
@@ -104,6 +103,7 @@
 
 
 2.1.6
+ * Failure detector detects and ignores local pauses (CASSANDRA-9183)
  * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029)
  * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
  * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)