You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/09/11 10:54:58 UTC
[1/2] cassandra git commit: ninja-add missing entry in CHANGES.txt
for CASSANDRA-10237
Repository: cassandra
Updated Branches:
refs/heads/trunk 5f1eee5a4 -> 5fc02d4f5
ninja-add missing entry in CHANGES.txt for CASSANDRA-10237
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a07977e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a07977e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a07977e
Branch: refs/heads/trunk
Commit: 0a07977e8b5ef429115ea07d7382415d2c51ba2a
Parents: 0600d7d
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Sep 11 10:54:09 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Sep 11 10:54:09 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a07977e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cda5762..f043230 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.0-rc1
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
* Cache selected index in read command to reduce lookups (CASSANDRA-10215)
* Small optimizations of sstable index serialization (CASSANDRA-10232)
* Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sn...@apache.org.
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/5fc02d4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc02d4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fc02d4f
Branch: refs/heads/trunk
Commit: 5fc02d4f5a0c83c0e8a46413adcc600c8593864c
Parents: 5f1eee5 0a07977
Author: Robert Stupp <sn...@snazy.de>
Authored: Fri Sep 11 10:54:31 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Fri Sep 11 10:54:31 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc02d4f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 695f21c,f043230..41156f0
--- 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
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
* Cache selected index in read command to reduce lookups (CASSANDRA-10215)
* Small optimizations of sstable index serialization (CASSANDRA-10232)
* Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)