Merge branch 'cassandra-2.2' into cassandra-3.0
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/8be382a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8be382a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8be382a7
Branch: refs/heads/trunk
Commit: 8be382a7ed99b72f2c0fb0d07ad53d0696bb6de3
Parents: 73d9a80 d3085b1
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 21 14:29:58 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 21 14:29:58 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
debian/init | 10 ----------
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be382a7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 69e616f,120be92..c86fb1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,12 +1,11 @@@
-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)
+ * 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)
* AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be382a7/debian/init
----------------------------------------------------------------------
|