Updated Branches: refs/heads/cassandra-1.2 791affd0b -> 6875c3bf8
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/6875c3bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6875c3bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6875c3bf Branch: refs/heads/cassandra-1.2 Commit: 6875c3bf85f0662be1b910c157aed0ba1e721214 Parents: 791affd 9db8827 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Nov 19 21:55:57 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Nov 19 21:55:57 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6875c3bf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7c61ec5,e63350b..c14a0d8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +1.2.1 + * 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-rc1 + * make consistency level configurable in cqlsh (CASSANDRA-4829) * fix cqlsh rendering of blob fields (CASSANDRA-4970) * fix cqlsh DESCRIBE command (CASSANDRA-4913) * save truncation position in system table (CASSANDRA-4906)
