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/f6924a1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6924a1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6924a1d Branch: refs/heads/trunk Commit: f6924a1de065c448c5da9a5afbe2bf4174631983 Parents: b440de5 8439e74 Author: blerer <[email protected]> Authored: Thu Sep 10 22:08:42 2015 +0200 Committer: blerer <[email protected]> Committed: Thu Sep 10 22:08:57 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 1 + doc/native_protocol_v1.spec | 746 --------------- doc/native_protocol_v2.spec | 954 ------------------- .../org/apache/cassandra/cql3/QueryOptions.java | 18 +- src/java/org/apache/cassandra/cql3/Tuples.java | 6 - .../org/apache/cassandra/cql3/UserTypes.java | 8 - .../cql3/statements/ModificationStatement.java | 3 - .../cassandra/db/marshal/CollectionType.java | 26 +- .../serializers/CollectionSerializer.java | 58 +- .../cassandra/thrift/CassandraServer.java | 4 +- .../org/apache/cassandra/transport/Event.java | 7 +- .../org/apache/cassandra/transport/Frame.java | 58 +- .../org/apache/cassandra/transport/Server.java | 3 +- .../transport/messages/BatchMessage.java | 7 +- .../transport/messages/ExecuteMessage.java | 14 +- .../transport/messages/QueryMessage.java | 22 +- .../org/apache/cassandra/cql3/CQLTester.java | 68 +- .../cassandra/cql3/IndexQueryPagingTest.java | 3 +- .../validation/entities/UFPureScriptTest.java | 6 +- .../cql3/validation/entities/UFTest.java | 15 +- .../cassandra/service/ClientWarningsTest.java | 20 +- .../cassandra/transport/ProtocolErrorTest.java | 56 +- .../cassandra/transport/SerDeserTest.java | 10 +- 23 files changed, 118 insertions(+), 1995 deletions(-) ----------------------------------------------------------------------
