This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a978754691770f588f062e057c4861cab71203e6 Merge: aaf6537 d93e43e Author: Mick Semb Wever <[email protected]> AuthorDate: Sat Jun 12 11:54:31 2021 +0200 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + build.xml | 72 ++++++++++------------ .../cql3/statements/QualifiedStatement.java | 4 +- .../statements/schema/CreateTableStatement.java | 2 +- .../apache/cassandra/transport/DriverBurnTest.java | 2 +- .../cassandra/transport/SimpleClientPerfTest.java | 2 +- .../auth/CassandraNetworkAuthorizerTest.java | 2 +- .../org/apache/cassandra/db/LivenessInfoTest.java | 1 - .../db/compaction/CompactionsCQLTest.java | 2 +- test/unit/org/apache/cassandra/dht/RangeTest.java | 5 +- .../repair/asymmetric/ReduceHelperTest.java | 4 +- .../cassandra/utils/CassandraVersionTest.java | 4 -- 12 files changed, 45 insertions(+), 56 deletions(-) diff --cc CHANGES.txt index 2cd9182,5e078f9..8f74359 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -4.0.1 +4.1 + * Add a system property to set hostId if not yet initialized (CASSANDRA-14582) + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) +Merged from 4.0: + * Cleanup dependency scopes (CASSANDRA-16704) * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707) 4.0-rc2 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
