Merge branch 'cassandra-3.0' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/574ca2e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/574ca2e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/574ca2e2 Branch: refs/heads/cassandra-3.X Commit: 574ca2e2ddcf785f8cb607953a60d70218ed54e2 Parents: 699fa9a 14b52bc Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Nov 11 11:01:41 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Nov 11 11:01:41 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574ca2e2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e765a9c,1b2b61f..2468da5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -147,6 -37,6 +147,7 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: ++ * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) * Fix Util.spinAssertEquals (CASSANDRA-12283) * Fix potential NPE for compactionstats (CASSANDRA-12462) * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813) http://git-wip-us.apache.org/repos/asf/cassandra/blob/574ca2e2/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
