Updated Branches:
refs/heads/cassandra-1.2 38aa459ef -> 10959ef3a
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/10959ef3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10959ef3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10959ef3
Branch: refs/heads/cassandra-1.2
Commit: 10959ef3ab9da7a46abe6b71ef06145c1979ea71
Parents: 38aa459 9b217e4
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Mon Dec 17 11:31:15 2012 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Mon Dec 17 11:31:15 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 99 +++++----------
src/java/org/apache/cassandra/db/DefsTable.java | 5 +-
src/java/org/apache/cassandra/db/Memtable.java | 12 --
src/java/org/apache/cassandra/db/Table.java | 6 +-
.../apache/cassandra/service/StorageService.java | 6 +-
.../org/apache/cassandra/streaming/StreamOut.java | 6 +-
7 files changed, 36 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/10959ef3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 97353ba,327d427..000429a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,18 @@@
+1.2.1
+ * 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
+ 1.2.0-rc2
* cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
+ * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
Merged from 1.1:
* fix temporarily missing schema after upgrade from pre-1.1.5
(CASSANDRA-5061)
* Fix ALTER TABLE overriding compression options with defaults
http://git-wip-us.apache.org/repos/asf/cassandra/blob/10959ef3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
