You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/08/14 17:46:47 UTC
[5/7] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da3a5a7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da3a5a7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da3a5a7f
Branch: refs/heads/trunk
Commit: da3a5a7fa29cd1e1fdcfa397a4b63a1ccb8e9b62
Parents: 1ba949a 7a6a509
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Aug 14 10:45:09 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Aug 14 10:45:09 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/da3a5a7f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6a9dc1e,5a76978..6bc671d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
-2.1.9
+2.2.1
+ * Fix histogram overflow exception (CASSANDRA-9973)
+ * Route gossip messages over dedicated socket (CASSANDRA-9237)
+ * 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) Allow encoding to be set through command line (CASSANDRA-10004)
* Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
* Write hints for paxos commits (CASSANDRA-7342)
* (cqlsh) Fix timestamps before 1970 on Windows, always