cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 21 Apr 2016 01:54:02 GMT
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/c568efee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c568efee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c568efee

Branch: refs/heads/trunk
Commit: c568efee54fd118ee9039394391e911fe690a1f3
Parents: dab1d57 eb072a0
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Thu Apr 21 09:44:08 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Thu Apr 21 09:45:49 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                |  2 ++
 pylib/cqlshlib/copyutil.py | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c568efee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ae73437,6e6e17b..6fffe2a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,13 +1,17 @@@
 -2.2.7
 +3.0.6
 + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk
consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
 +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)
 -Merged from 2.1:
 - * (cqlsh) Fix potential COPY deadlock when parent process is terminating child
 -   processes (CASSANDRA-11505)
 -
 -
 -2.2.6
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c568efee/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------


Mime
View raw message