Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22a3db06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22a3db06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22a3db06 Branch: refs/heads/trunk Commit: 22a3db0653ea5a45b396c7d8c07138d4257be5d6 Parents: 8fcedf5 9d9a1a1 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Nov 3 16:09:43 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Nov 3 16:09:43 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/ReadCommandVerbHandler.java | 4 +- .../db/monitoring/ConstructionTime.java | 41 ----------- .../cassandra/db/monitoring/Monitorable.java | 3 +- .../db/monitoring/MonitorableImpl.java | 22 ++++-- .../cassandra/db/monitoring/MonitoringTask.java | 10 +-- .../cassandra/net/IncomingTcpConnection.java | 2 +- .../cassandra/net/MessageDeliveryTask.java | 4 +- .../org/apache/cassandra/net/MessageIn.java | 71 +++++++++++++------- .../apache/cassandra/net/MessagingService.java | 44 ++++++------ .../apache/cassandra/service/ReadCallback.java | 3 +- .../apache/cassandra/service/StorageProxy.java | 3 +- .../db/monitoring/MonitoringTaskTest.java | 56 ++++++++------- .../org/apache/cassandra/hints/HintTest.java | 4 +- .../cassandra/hints/HintsServiceTest.java | 3 +- .../apache/cassandra/net/MatcherResponse.java | 2 +- .../cassandra/net/MessagingServiceTest.java | 16 ++--- .../cassandra/net/MockMessagingServiceTest.java | 6 +- .../cassandra/service/DataResolverTest.java | 3 +- 19 files changed, 147 insertions(+), 151 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22a3db06/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 176d34a,40aace3..fb16d4b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +4.0 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + + 3.10 + * Fix crossNode value when receiving messages (CASSANDRA-12791) * Don't load MX4J beans twice (CASSANDRA-12869) * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838) * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
