Merge branch 'cassandra-2.1' into cassandra-2.2
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/20d55086
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20d55086
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20d55086
Branch: refs/heads/cassandra-3.0
Commit: 20d5508618e65091f9e4c277a97dab2282199f24
Parents: d3085b1 a2c4d4e
Author: Sylvain Lebresne <[email protected]>
Authored: Wed Oct 21 14:32:56 2015 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Wed Oct 21 14:32:56 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/20d55086/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 120be92,d06345e..ed28f2e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,11 +1,15 @@@
-2.1.12
+2.2.4
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
- * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
+ * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
* Fix potential NPE from handling result of SIM.highestSelectivityIndex
(CASSANDRA-10550)
- * Fix paging issues with partitions containing only static columns data
- (CASSANDRA-10381)
+ * Fix paging issues with partitions containing only static columns data
(CASSANDRA-10381)
* Fix conditions on static columns (CASSANDRA-10264)
* AssertionError: attempted to delete non-existing file CommitLog
(CASSANDRA-10377)
- * Merge range tombstones during compaction (CASSANDRA-7953)
* (cqlsh) Distinguish negative and positive infinity in output
(CASSANDRA-10523)
* (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
* Don't allow startup if the node's rack has changed (CASSANDRA-10242)
