Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/054f0a15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/054f0a15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/054f0a15 Branch: refs/heads/cassandra-2.1 Commit: 054f0a1580fb68a1e2ed0a921a0daf82806fad8a Parents: 6544fb7 b2a2d46 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri May 15 17:31:39 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri May 15 17:31:39 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/DropIndexStatement.java | 27 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/054f0a15/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 651f49a,c3e84db..fa050cd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,9 +1,31 @@@ -2.0.16: +2.1.6 + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) +Merged from 2.0: + * Push correct protocol notification for DROP INDEX (CASSANDRA-9310) * token-generator - generated tokens too long (CASSANDRA-9300) - - -2.0.15: * Fix counting of tombstones for TombstoneOverwhelmingException (CASSANDRA-9299) * Fix ReconnectableSnitch reconnecting to peers during upgrade (CASSANDRA-6702) * Include keyspace and table name in error log for collections over the size http://git-wip-us.apache.org/repos/asf/cassandra/blob/054f0a15/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java ----------------------------------------------------------------------
