This is an automated email from the ASF dual-hosted git repository. samt pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from a63df4d Merge branch 'cassandra-3.0' into cassandra-3.11 new 0388d89 Allow max protocol version to be capped new 3040965 Merge branch 'cassandra-3.0' into cassandra-3.11 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 3 +- NEWS.txt | 5 + bin/cqlsh.py | 2 +- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 22 +++ .../org/apache/cassandra/db/SystemKeyspace.java | 43 ++++++ .../apache/cassandra/service/CassandraDaemon.java | 10 ++ .../cassandra/service/NativeTransportService.java | 19 +++ .../apache/cassandra/service/StorageService.java | 21 ++- .../cassandra/service/StorageServiceMBean.java | 3 + .../org/apache/cassandra/transport/Client.java | 2 +- .../cassandra/transport/ConfiguredLimit.java | 112 ++++++++++++++ src/java/org/apache/cassandra/transport/Frame.java | 6 +- .../org/apache/cassandra/transport/Message.java | 10 +- .../cassandra/transport/ProtocolVersion.java | 6 +- .../{CBCodec.java => ProtocolVersionLimit.java} | 12 +- .../org/apache/cassandra/transport/Server.java | 22 ++- .../apache/cassandra/transport/SimpleClient.java | 4 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 52 ++++++- .../cassandra/transport/DynamicLimitTest.java | 111 ++++++++++++++ .../cassandra/transport/ProtocolErrorTest.java | 8 +- .../transport/ProtocolNegotiationTest.java | 166 +++++++++++++++++++++ .../cassandra/transport/ProtocolTestHelper.java | 95 ++++++++++++ .../cassandra/transport/ProtocolVersionTest.java | 6 +- 24 files changed, 709 insertions(+), 33 deletions(-) create mode 100644 src/java/org/apache/cassandra/transport/ConfiguredLimit.java copy src/java/org/apache/cassandra/transport/{CBCodec.java => ProtocolVersionLimit.java} (77%) create mode 100644 test/unit/org/apache/cassandra/transport/DynamicLimitTest.java create mode 100644 test/unit/org/apache/cassandra/transport/ProtocolNegotiationTest.java create mode 100644 test/unit/org/apache/cassandra/transport/ProtocolTestHelper.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org