Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed13e05b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed13e05b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed13e05b Branch: refs/heads/cassandra-3.3 Commit: ed13e05bdcb1370d81c931add2ca0f689c104fc2 Parents: 628c076 58643b0 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Jan 14 17:12:44 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Jan 14 17:12:44 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed13e05b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bfe1730,a1835bd..4c44120 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,7 -26,16 +18,8 @@@ Merged from 2.2 * Optimize pending range computation (CASSANDRA-9258) * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) * drop/alter user should be case sensitive (CASSANDRA-10817) - * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) - * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) - * Add new types to Stress (CASSANDRA-9556) - * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997) * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686) * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477) * If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed13e05b/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
