Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ffeebff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ffeebff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ffeebff
Branch: refs/heads/trunk
Commit: 8ffeebff631ee0cd7c36ca164bdf5c231832e57c
Parents: 5b68b2d 34193ee
Author: Tyler Hobbs <[email protected]>
Authored: Fri Aug 7 15:34:16 2015 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Fri Aug 7 15:34:16 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh.py | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ffeebff/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 98c8d73,c4409c1..0ed63f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
-2.1.9
+2.2.1
+ * Add checksum to saved cache files (CASSANDRA-9265)
+ * Log warning when using an aggregate without partition key (CASSANDRA-9737)
+ * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
+ * UDF / UDA execution time in trace (CASSANDRA-9723)
+ * Fix broken internode SSL (CASSANDRA-9884)
+Merged from 2.1:
+ * (cqlsh) Avoid overwriting new config file with old config
+ when both exist (CASSANDRA-9777)
* Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
* Cannot replace token does not exist - DN node removed as Fat Client
(CASSANDRA-9871)
* Fix handling of enable/disable autocompaction (CASSANDRA-9899)
