Merge branch 'cassandra-1.2.0' into cassandra-1.2
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/63743835
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63743835
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63743835
Branch: refs/heads/trunk
Commit: 637438355c10db4c7a9ae56442a788b36e1bd59e
Parents: db9eb04 f562f0b
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Thu Dec 13 00:11:01 2012 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Dec 13 00:11:01 2012 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
bin/cqlsh | 14 +++++++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/63743835/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2a70cec,d73849c..ba0177b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,17 @@@
+1.2.1
+ * 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
+ * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
+
+
1.2-rc1
* rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
* add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
