Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65b377f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b377f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65b377f7 Branch: refs/heads/cassandra-1.2 Commit: 65b377f73e79d47ff7c5b4ee046951c953e00da7 Parents: 986893e 3d01ec7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 27 10:10:00 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 27 10:10:28 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b377f7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 45b0b5b,55a6bb5..c4c2407 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,7 +1,21 @@@ -1.1.9 - * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087) +1.2.0 + * Disallow counters in collections (CASSANDRA-5082) + ++ +1.2.0-rc2 + * fix nodetool ownership display with vnodes (CASSANDRA-5065) + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060) + * Fix potential infinite loop when reloading CFS (CASSANDRA-5064) + * Fix SimpleAuthorizer example (CASSANDRA-5072) + * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070) + * Includes cassandra-shuffle in the debian package (CASSANDRA-5058) +Merged from 1.1: * fix multithreaded compaction deadlock (CASSANDRA-4492) + * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061) + * Fix ALTER TABLE overriding compression options with defaults + (CASSANDRA-4996, 5066) * fix specifying and altering crc_check_chance (CASSANDRA-5053) + * fix Murmur3Partitioner ownership% calculation (CASSANDRA-5076) * Don't expire columns sooner than they should in 2ndary indexes (CASSANDRA-5079)
