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/67903d77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67903d77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67903d77
Branch: refs/heads/cassandra-2.2
Commit: 67903d7789d88aebb524480ff9854c666ce3cace
Parents: ce7159e 1e3f03e
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Fri Aug 7 15:52:47 2015 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Fri Aug 7 15:52:47 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67903d77/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0ed63f1,3b0241c..705e560
--- 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) Fix timestamps before 1970 on Windows, always
+ use UTC for timestamp display (CASSANDRA-10000)
* (cqlsh) Avoid overwriting new config file with old config
when both exist (CASSANDRA-9777)
* Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
