Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49642e7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49642e7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49642e7b Branch: refs/heads/trunk Commit: 49642e7bf87dfaf82f351c16eca4d28a0e07f60d Parents: 3d737ec 5f2e220 Author: Sylvain Lebresne <[email protected]> Authored: Thu Mar 20 18:25:45 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Mar 20 18:25:45 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + lib/netty-3.6.6.Final.jar | Bin 1206119 -> 0 bytes lib/netty-all-4.0.17.Final.jar | Bin 0 -> 1613159 bytes .../org/apache/cassandra/cql3/QueryOptions.java | 6 +- .../org/apache/cassandra/cql3/ResultSet.java | 10 +- .../org/apache/cassandra/transport/CBCodec.java | 6 +- .../org/apache/cassandra/transport/CBUtil.java | 75 +++++++------ .../apache/cassandra/transport/Connection.java | 5 +- .../apache/cassandra/transport/DataType.java | 6 +- .../org/apache/cassandra/transport/Event.java | 20 ++-- .../org/apache/cassandra/transport/Frame.java | 104 ++++++++++--------- .../cassandra/transport/FrameCompressor.java | 10 +- .../org/apache/cassandra/transport/Message.java | 71 ++++++------- .../apache/cassandra/transport/OptionCodec.java | 18 ++-- .../transport/RequestThreadPoolExecutor.java | 101 +++++++++--------- .../org/apache/cassandra/transport/Server.java | 90 ++++++++-------- .../cassandra/transport/ServerConnection.java | 4 +- .../cassandra/transport/SimpleClient.java | 93 ++++++++--------- .../transport/messages/AuthChallenge.java | 6 +- .../transport/messages/AuthResponse.java | 6 +- .../transport/messages/AuthSuccess.java | 6 +- .../transport/messages/AuthenticateMessage.java | 6 +- .../transport/messages/BatchMessage.java | 6 +- .../transport/messages/CredentialsMessage.java | 6 +- .../transport/messages/ErrorMessage.java | 6 +- .../transport/messages/EventMessage.java | 6 +- .../transport/messages/ExecuteMessage.java | 6 +- .../transport/messages/OptionsMessage.java | 6 +- .../transport/messages/PrepareMessage.java | 6 +- .../transport/messages/QueryMessage.java | 6 +- .../transport/messages/ReadyMessage.java | 6 +- .../transport/messages/RegisterMessage.java | 6 +- .../transport/messages/ResultMessage.java | 26 ++--- .../transport/messages/StartupMessage.java | 6 +- .../transport/messages/SupportedMessage.java | 6 +- .../cassandra/stress/util/JavaDriverClient.java | 6 +- 36 files changed, 374 insertions(+), 374 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49642e7b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49642e7b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/transport/messages/StartupMessage.java index 5ae7a75,1a5071f..ac7a1f2 --- a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java @@@ -20,9 -20,11 +20,9 @@@ package org.apache.cassandra.transport. import java.util.HashMap; import java.util.Map; - import org.jboss.netty.buffer.ChannelBuffer; + import io.netty.buffer.ByteBuf; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.*; import org.apache.cassandra.utils.SemanticVersion;
