Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2dbcb5da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dbcb5da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dbcb5da Branch: refs/heads/cassandra-3.0 Commit: 2dbcb5dae15ac0c2dc0a35b83e820f6a9147b9fb Parents: cfc398e b25139f Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Apr 27 08:44:04 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Apr 27 08:44:04 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/2dbcb5da/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d73ed01,ff26fde..b3dea85 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ -2.1.15 +2.2.7 + * Add missing files to debian packages (CASSANDRA-11642) + * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621) + * 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) +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)
