Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7707a0ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7707a0ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7707a0ed Branch: refs/heads/cassandra-3.11 Commit: 7707a0ed59e0f22a864b3c05515df7f1041e3c42 Parents: 1248d36 60d3292 Author: Alex Petrov <oleksandr.pet...@gmail.com> Authored: Wed Mar 8 18:02:19 2017 +0100 Committer: Alex Petrov <oleksandr.pet...@gmail.com> Committed: Wed Mar 8 18:02:19 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../unit/org/apache/cassandra/cql3/CQLTester.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 88599b7,0979852..f73dc12 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,10 +1,15 @@@ -3.0.13 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * Address message coalescing regression (CASSANDRA-12676) +Merged from 3.0: + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238) -Merged from 2.2: - * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) - - -3.0.12 * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294) * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233) * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7707a0ed/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
