Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01847ac5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01847ac5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01847ac5 Branch: refs/heads/trunk Commit: 01847ac51064f894d0c6125fa36f3958f7846ba8 Parents: f000ff0 f99f8a8 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jun 1 15:33:45 2016 +0200 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jun 1 15:33:45 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01847ac5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 82b4502,07845a6..c6cca1a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,10 -17,10 +20,11 @@@ Merged from 2.2 * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) * Possible memory leak in NIODataInputStream (CASSANDRA-11867) * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) Merged from 2.1: + * cqlsh: apply current keyspace to source command (CASSANDRA-11152) - * Backport CASSANDRA-11578 (CASSANDRA-11750) * Clear out parent repair session if repair coordinator dies (CASSANDRA-11824) * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840) * Do not consider local node a valid source during replace (CASSANDRA-11848) http://git-wip-us.apache.org/repos/asf/cassandra/blob/01847ac5/bin/cqlsh.py ----------------------------------------------------------------------
