Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6d4f7a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6d4f7a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6d4f7a4 Branch: refs/heads/trunk Commit: a6d4f7a4e8d5d0d7829ab6659791125f56cd6a5c Parents: 63c5a9e d67816b Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 18 14:32:25 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 18 14:32:25 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 18 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6d4f7a4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3e9f052,2e789fa..d27814d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +1.2.1 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057) + * apply disk_failure_policy to bad disks on initial directory creation + (CASSANDRA-4847) + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + 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)
