cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 10 Jun 2016 21:00:36 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/db8df915
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db8df915
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db8df915

Branch: refs/heads/trunk
Commit: db8df91530512cc192b95252ccad89f0edee8540
Parents: f0613bf 3d211e9
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Fri Jun 10 15:56:47 2016 -0500
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Fri Jun 10 15:56:47 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                |  3 +++
 pylib/cqlshlib/copyutil.py | 38 +++++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db8df915/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d699f93,47aef7e..a944bd1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,11 -2,11 +14,14 @@@ Merged from 3.0
   * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
  Merged from 2.2:
   * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
+ Merged from 2.1:
+  * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections
(CASSANDRA-11749)
+ 
  
 -3.0.7
 +3.7
 + * Support multiple folders for user defined compaction tasks (CASSANDRA-11765)
 + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
 +Merged from 3.0:
   * Fix legacy serialization of Thrift-generated non-compound range tombstones
     when communicating with 2.x nodes (CASSANDRA-11930)
   * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)

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


Mime
View raw message