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/98be5de7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98be5de7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98be5de7
Branch: refs/heads/cassandra-3.0
Commit: 98be5de7035509fe7160917350e6c401df67d3b0
Parents: a337907 328916d
Author: blerer <benjamin.le...@datastax.com>
Authored: Tue Oct 20 14:37:10 2015 +0200
Committer: blerer <benjamin.le...@datastax.com>
Committed: Tue Oct 20 14:37:10 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/pager/AbstractQueryPager.java | 6 +++++-
.../cassandra/service/pager/RangeSliceQueryPager.java | 8 ++++++--
.../org/apache/cassandra/service/pager/SliceQueryPager.java | 9 +++++++--
4 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98be5de7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 261a53a,dbb3480..458d0d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,9 +1,13 @@@
-2.1.12
- * Fix paging issues with partitions containing only static columns data
- (CASSANDRA-10381)
+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:
++ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98be5de7/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
----------------------------------------------------------------------
