cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 27 Feb 2015 22:19:52 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/transport/messages/ErrorMessage.java


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

Branch: refs/heads/trunk
Commit: 369ed3e1d0e87966a0836a3980713f91de3ef520
Parents: aa7c736 e76ebce
Author: Tyler Hobbs <tylerhobbs@apache.org>
Authored: Fri Feb 27 16:19:35 2015 -0600
Committer: Tyler Hobbs <tylerhobbs@apache.org>
Committed: Fri Feb 27 16:19:35 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |   4 +-
 .../org/apache/cassandra/transport/Frame.java   |  18 +++-
 .../transport/messages/ErrorMessage.java        |   9 +-
 .../cassandra/transport/ProtocolErrorTest.java  | 103 +++++++++++++++++++
 4 files changed, 129 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/369ed3e1/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/369ed3e1/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/messages/ErrorMessage.java
index d30e4ef,a049a57..1e9564c
--- a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java
@@@ -17,10 -17,9 +17,11 @@@
   */
  package org.apache.cassandra.transport.messages;
  
 -import com.google.common.annotations.VisibleForTesting;
 +import java.util.List;
 +
  import io.netty.buffer.ByteBuf;
  import io.netty.handler.codec.CodecException;
++import com.google.common.annotations.VisibleForTesting;
  import com.google.common.base.Predicate;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;


Mime
View raw message