You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/08/13 15:35:39 UTC
[1/2] cassandra git commit: ninja-fix changes
Repository: cassandra
Updated Branches:
refs/heads/trunk 8b1c58444 -> 123fc31ac
ninja-fix changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8547ecc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8547ecc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8547ecc2
Branch: refs/heads/trunk
Commit: 8547ecc245afbe968438b7509322e6f1d2f76bb1
Parents: 6e2cf57
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Aug 13 06:34:28 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Aug 13 06:34:28 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8547ecc2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2a9b89b..fae0cfc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,4 @@
3.0.0-beta1
- * Route gossip messages over dedicated socket (CASSANDRA-9237)
* Add option to only purge repaired tombstones (CASSANDRA-6434)
* Change authorization handling for MVs (CASSANDRA-9927)
* Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
@@ -15,6 +14,7 @@
* Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
* Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
Merged from 2.2:
+ * Route gossip messages over dedicated socket (CASSANDRA-9237)
* Add checksum to saved cache files (CASSANDRA-9265)
* Log warning when using an aggregate without partition key (CASSANDRA-9737)
Merged from 2.1:
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@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/123fc31a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/123fc31a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/123fc31a
Branch: refs/heads/trunk
Commit: 123fc31ac1fd59fd20afff825a4db50b87ae03d4
Parents: 8b1c584 8547ecc
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Aug 13 06:35:08 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Aug 13 06:35:08 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/123fc31a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2b1b9cb,fae0cfc..f451af1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,4 +1,8 @@@
+3.2
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.0.0-beta1
- * Route gossip messages over dedicated socket (CASSANDRA-9237)
* Add option to only purge repaired tombstones (CASSANDRA-6434)
* Change authorization handling for MVs (CASSANDRA-9927)
* Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)