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/fae7bf9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fae7bf9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fae7bf9c Branch: refs/heads/cassandra-3.0 Commit: fae7bf9c22c6a7f9c06e14c6ae299e9a330cda30 Parents: 5d37fc4 2dbcb5d Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Apr 27 08:45:14 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Apr 27 08:45:14 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/setup.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fae7bf9c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 277eac4,b3dea85..b1cf2ac --- 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: + * 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) * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574)
