Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd872280 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd872280 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd872280 Branch: refs/heads/trunk Commit: dd87228072d00b9732878577f121f191aab65d71 Parents: 87282f1 b25ddd8 Author: Mikhail Stepura <mish...@apache.org> Authored: Thu Jun 19 15:16:28 2014 +1100 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu Jun 19 15:16:28 2014 +1100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 28e831b,8da8258..16e0531 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ -1.2.17 +2.0.9 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) + * Fix native protocol CAS batches (CASSANDRA-7337) + * Add per-CF range read request latency metrics (CASSANDRA-7338) + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) + * Add conditional CREATE/DROP USER support (CASSANDRA-7264) + * Swap local and global default read repair chances (CASSANDRA-7320) + * Add missing iso8601 patterns for date strings (CASSANDRA-6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) + * Reference sstables before populating key cache (CASSANDRA-7234) +Merged from 1.2: + * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266) * Errors in FlushRunnable may leave threads hung (CASSANDRA-7275) * reduce failure detector initial value to 2s (CASSANDRA-7307) * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd872280/bin/cqlsh ----------------------------------------------------------------------