cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 15 Dec 2015 21:40:47 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bab66dd1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bab66dd1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bab66dd1

Branch: refs/heads/trunk
Commit: bab66dd1af377bec8aa3a144f19e925d4ecfa9cb
Parents: a018bcb 1deb044
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Dec 15 21:40:32 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Dec 15 21:40:32 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                |   1 +
 bin/cqlsh.py               | 329 ++-------------
 pylib/cqlshlib/copyutil.py | 912 ++++++++++++++++++++++++++++++++++------
 pylib/cqlshlib/util.py     |  19 +
 4 files changed, 840 insertions(+), 421 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab66dd1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fb6f7e9,e167126..b3dc35b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,7 -3,12 +24,8 @@@ Merged from 3.0
     (CASSANDRA-10822)
  Merged from 2.2
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)
   * Make Stress compiles within eclipse (CASSANDRA-10807)
   * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab66dd1/bin/cqlsh.py
----------------------------------------------------------------------


Mime
View raw message