cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 15 Sep 2015 17:27:27 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/6d3617dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d3617dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d3617dd

Branch: refs/heads/trunk
Commit: 6d3617dd5eaf3406c8339bf1ead57c009cbf2575
Parents: 7a0698e b454484
Author: T Jake Luciani <jake@apache.org>
Authored: Tue Sep 15 13:27:10 2015 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Tue Sep 15 13:27:10 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d3617dd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 226f1a1,36ae689..f817f4f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
   * Give index implementations more control over rebuild operations (CASSANDRA-10312)
   * Update index file format (CASSANDRA-10314)
   * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)


Mime
View raw message