Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2afd04e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2afd04e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2afd04e Branch: refs/heads/cassandra-3.0 Commit: f2afd04e7335060f06d2143a6cda00287dfcceb1 Parents: fae7bf9 b6b2517 Author: Stefania Alborghetti <[email protected]> Authored: Wed Apr 27 09:08:28 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Wed Apr 27 09:09:10 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 36 +++++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2afd04e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b1cf2ac,bdabf29..f02d4f2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -17,11 -4,8 +17,12 @@@ Merged from 2.2 * cqlsh: COPY FROM should use regular inserts for single statement batches and report errors correctly if workers processes crash on initialization (CASSANDRA-11474) * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) + * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) Merged from 2.1: + * cqlsh COPY FROM fails for null values with non-prepared statements (CASSANDRA-11631) * Make cython optional in pylib/setup.py (CASSANDRA-11630) * Change order of directory searching for cassandra.in.sh to favor local one (CASSANDRA-11628) * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2afd04e/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
