Updated Branches: refs/heads/cassandra-1.2 40762aec0 -> 158376963 refs/heads/trunk 32ad73bcd -> d173ab51a
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d173ab51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d173ab51 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d173ab51 Branch: refs/heads/trunk Commit: d173ab51ac1a024670e47dad55e4f25f40c720da Parents: 32ad73b 1583769 Author: Jonathan Ellis <[email protected]> Authored: Thu Dec 13 10:19:29 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Dec 13 10:19:29 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../cassandra/config/DatabaseDescriptor.java | 5 ++ .../cassandra/db/BlacklistedDirectories.java | 4 +- src/java/org/apache/cassandra/db/Directories.java | 15 +++++- .../org/apache/cassandra/io/util/FileUtils.java | 31 ++++++++++++ .../apache/cassandra/service/CassandraDaemon.java | 31 +----------- .../org/apache/cassandra/db/DirectoriesTest.java | 38 +++++++++++++++ 7 files changed, 94 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d173ab51/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0df3a94,8a93921..44b3a14 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + + 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/d173ab51/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
