cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject cassandra git commit: ninja revert "merged from 3.0"
Date Sat, 05 Sep 2015 17:26:13 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 5c9792c9a -> 108f3de9b


ninja revert "merged from 3.0"


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

Branch: refs/heads/trunk
Commit: 108f3de9bb1015fc4c6bcd6a7828142b68586a24
Parents: 5c9792c
Author: Robert Stupp <snazy@snazy.de>
Authored: Sat Sep 5 19:25:19 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Sat Sep 5 19:25:19 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/108f3de9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c23f2cd..6fcb862 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,12 @@
 3.2
  * Add transparent data encryption core classes (CASSANDRA-9945)
-Merged from 3.0:
+
+
+3.0.0-rc1
  * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
+
+
+3.0.0-beta2
  * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220)
  * Fix backward compatibility issue due to AbstractBounds serialization bug (CASSANDRA-9857)
  * Fix startup error when upgrading nodes (CASSANDRA-10136)


Mime
View raw message