Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9413211
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9413211
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9413211
Branch: refs/heads/cassandra-3.0
Commit: c9413211ced86c4b69b1bbf61d5f990d0d56961a
Parents: 8be382a 20d5508
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 21 14:33:20 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 21 14:33:20 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9413211/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c86fb1f,ed28f2e..0c5c9c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,11 +1,10 @@@
-2.2.4
+3.0
+ * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
+Merged from 2.2:
* 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 conditions on static columns (CASSANDRA-10264)
|