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/763465b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/763465b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/763465b2 Branch: refs/heads/trunk Commit: 763465b29894df99077a3824bf9c239aea25c1d1 Parents: f18de00 34dc2f3 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Nov 17 21:11:22 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Nov 17 21:11:22 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/formatting.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/763465b2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 03bf61f,7f5a487..9148c9e --- 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 + * fix cqlsh rendering of blob fields (CASSANDRA-4970) * fix cqlsh DESCRIBE command (CASSANDRA-4913) * save truncation position in system table (CASSANDRA-4906) * Move CompressionMetadata off-heap (CASSANDRA-4937)
