Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/734a3bfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/734a3bfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/734a3bfa Branch: refs/heads/cassandra-2.2 Commit: 734a3bfa782bb0489878cd14c2f589d662c22f11 Parents: 5a356a7 32a6f20 Author: Robert Stupp <sn...@snazy.de> Authored: Wed Oct 28 14:18:25 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Oct 28 14:18:25 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 5 ++ conf/cassandra.yaml | 2 + .../cassandra/config/EncryptionOptions.java | 1 + .../org/apache/cassandra/transport/Server.java | 77 ++++++++++++++++++-- 5 files changed, 78 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/734a3bfa/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9021e9d,998dd22..c4f606f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ -2.1.12 +2.2.4 + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Support encrypted and plain traffic on the same port (CASSANDRA-10559) * Do STCS in DTCS windows (CASSANDRA-10276) * Don't try to get ancestors from half-renamed sstables (CASSANDRA-10501) * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251) http://git-wip-us.apache.org/repos/asf/cassandra/blob/734a3bfa/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 028d26d,c6ea6c0..94567d6 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,23 -13,21 +13,28 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -2.1.12 -====== +2.2.4 +===== + +Deprecation +----------- + - Pig support has been deprecated, and will be removed in 3.0. + Please see CASSANDRA-10542 for more details. + +Operations +---------- + - Switching racks is no longer an allowed operation on a node which has + data. Instead, the node will need to be decommissioned and rebootstrapped. + If moving from the SimpleSnitch, make sure the rack containing all current + nodes is named "rack1". + New features + ------------ + - Native protocol server now allows both SSL and non-SSL connections on + the same port. - - Switching racks is no longer an allowed operation on a node which has - data. Instead, the node will need to be decommissioned and rebootstrapped. - If moving from the SimpleSnitch, make sure the rack containing all current - nodes is named "rack1". To override this behavior when manually wiping - the node and bootstrapping, use -Dcassandra.ignore_rack=true. + -2.1.11 +2.2.3 ===== Upgrading http://git-wip-us.apache.org/repos/asf/cassandra/blob/734a3bfa/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/734a3bfa/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/transport/Server.java index d610bff,02f17b0..c56564c --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@@ -30,20 -30,17 +30,22 @@@ import java.util.concurrent.atomic.Atom import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.netty.bootstrap.ServerBootstrap; + import io.netty.buffer.ByteBuf; +import io.netty.channel.*; import io.netty.channel.epoll.Epoll; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollServerSocketChannel; -import io.netty.handler.codec.ByteToMessageDecoder; -import io.netty.util.Version; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import io.netty.channel.group.ChannelGroup; +import io.netty.channel.group.DefaultChannelGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; ++import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.ssl.SslHandler; +import io.netty.util.Version; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.GlobalEventExecutor; import io.netty.util.internal.logging.InternalLoggerFactory;
