cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Sat, 05 Sep 2015 16:28:48 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/5c9792c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c9792c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c9792c9

Branch: refs/heads/trunk
Commit: 5c9792c9abaf6ec29c1ec2828ed04cac4112636c
Parents: 3c1cb80 a7895cf
Author: Robert Stupp <snazy@snazy.de>
Authored: Sat Sep 5 18:28:31 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Sat Sep 5 18:28:31 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   5 +-
 conf/cassandra.yaml                             |   8 +
 .../org/apache/cassandra/config/Config.java     |   1 +
 .../cassandra/config/DatabaseDescriptor.java    |  25 +++
 .../cassandra/service/CassandraDaemon.java      |  38 +++-
 .../service/NativeTransportService.java         | 199 +++++++++++++++++++
 .../cassandra/service/StorageService.java       |  11 +-
 .../org/apache/cassandra/transport/Server.java  | 170 +++++++++-------
 .../org/apache/cassandra/cql3/CQLTester.java    |   2 +-
 .../service/NativeTransportServiceTest.java     | 193 ++++++++++++++++++
 10 files changed, 563 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c9792c9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 962b0b2,afd45e5..c23f2cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,8 +1,7 @@@
 -3.0.0-rc1
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
- 
- 
- 3.0.0-beta2
++Merged from 3.0:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c9792c9/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c9792c9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------


Mime
View raw message