Merge branch 'cameron/12765-2.1' into cameron/12765-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a370409c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a370409c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a370409c Branch: refs/heads/trunk Commit: a370409c802edfbce6a1682083df5cb5f376a34b Parents: 4eed687 f7ded1c Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Oct 21 08:40:20 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Oct 21 08:40:20 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 8 +++- .../cassandra/db/CollationController.java | 10 ++--- .../db/CollationControllerCQLTest.java | 46 ++++++++++++++++++++ 3 files changed, 55 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a370409c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 41e3f94,e922635..efd0f5c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,14 +1,50 @@@ +2.2.9 + * Clean up permissions when a UDA is dropped (CASSANDRA-12720) + * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117) + * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457) + * Fix merkle tree depth calculation (CASSANDRA-12580) + * Make Collections deserialization more robust (CASSANDRA-12618) + * Better handle invalid system roles table (CASSANDRA-12700) - - ++Merged from 2.1: ++======= + 2.1.17 + * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) + + -2.1.16 - * Avoid infinitely looping result set when paging SELECT queries with - an IN clause with duplicate keys by treating the IN values as a set instead - of a list (CASSANDRA-12420) +2.2.8 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) + * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642) + * Decrement pending range calculator jobs counter in finally block + (CASSANDRA-12554) + * Add local address entry in PropertyFileSnitch (CASSANDRA-11332) + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + * Fail repair on non-existing table (CASSANDRA-12279) + * cqlsh copy: fix missing counter values (CASSANDRA-12476) + * Move migration tasks to non-periodic queue, assure flush executor shutdown after non-periodic executor (CASSANDRA-12251) + * cqlsh copy: fixed possible race in initializing feeding thread (CASSANDRA-11701) + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set (CASSANDRA-11357) + * Update StorageProxy range metrics for timeouts, failures and unavailables (CASSANDRA-9507) + * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635) + * Add decay to histograms and timers used for metrics (CASSANDRA-11752) + * Fix hanging stream session (CASSANDRA-10992) + * Add byteman support for testing (CASSANDRA-12377) + * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371) + * Restore JVM metric export for metric reporters (CASSANDRA-12312) + * Release sstables of failed stream sessions only when outgoing transfers are finished (CASSANDRA-11345) + * Revert CASSANDRA-11427 (CASSANDRA-12351) + * Wait for tracing events before returning response and query at same consistency level client side (CASSANDRA-11465) + * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979) + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214) + * Synchronize ThriftServer::stop() (CASSANDRA-12105) + * Use dedicated thread for JMX notifications (CASSANDRA-12146) + * NPE when trying to remove purgable tombstones from result (CASSANDRA-12143) + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) + * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) + * Don't write shadowed range tombstone (CASSANDRA-12030) +Merged from 2.1: * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) - * Include column family parameter when -st and -et are provided (CASSANDRA-11866) - * Fix queries with empty ByteBuffer values in clustering column restrictions (CASSANDRA-12127) * Disable passing control to post-flush after flush failure to prevent data loss (CASSANDRA-11828) * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040) * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a370409c/src/java/org/apache/cassandra/db/CollationController.java ----------------------------------------------------------------------
