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/41393ded Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41393ded Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41393ded Branch: refs/heads/cassandra-3.11 Commit: 41393ded1fc934620b3fc48cf17c4bc9580dee14 Parents: 6d5cd2d e885886 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Feb 9 21:46:02 2017 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Feb 9 21:46:02 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/functions/ThreadAwareSecurityManager.java | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41393ded/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3073fd7,ae7b069..0e5700f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.11 +3.11.0 + * 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) +Merged from 3.0: + * Reloading logback.xml does not work (CASSANDRA-13173) * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) http://git-wip-us.apache.org/repos/asf/cassandra/blob/41393ded/src/java/org/apache/cassandra/cql3/functions/ThreadAwareSecurityManager.java ----------------------------------------------------------------------
