You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/08/11 20:41:38 UTC

[1/2] cassandra git commit: Fix CHANGES.txt

Repository: cassandra
Updated Branches:
  refs/heads/trunk d9e9c948d -> 3462a23dc


Fix CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 72acd6ba9e9effcd2b1c3c6fc4b8537d9fd5d70c
Parents: 67269f6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 11 21:40:30 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 11 21:40:30 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72acd6ba/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b817cfd..d7e84bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,6 @@
  * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
  * Repair improvements when using vnodes (CASSANDRA-5220)
  * Disable scripted UDFs by default (CASSANDRA-9889)
- * Add transparent data encryption core classes (CASSANDRA-9945)
  * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
  * Use byte to serialize MT hash length (CASSANDRA-9792)
  * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Posted by al...@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/3462a23d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3462a23d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3462a23d

Branch: refs/heads/trunk
Commit: 3462a23dc2e2492f6a94ba131a16e4bce31b4b25
Parents: d9e9c94 72acd6b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 11 21:40:52 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 11 21:42:34 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3462a23d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b817cfd,d7e84bf..0ebc6d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,3 -1,3 +1,7 @@@
++3.2
++ * Add transparent data encryption core classes (CASSANDRA-9945)
++
++
  3.0.0-beta1
   * Add option to only purge repaired tombstones (CASSANDRA-6434)
   * Change authorization handling for MVs (CASSANDRA-9927)