Updated Branches: refs/heads/cassandra-1.2 31ba28909 -> db9eb04e2 refs/heads/trunk 5363189f9 -> bd572d7d9
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/bd572d7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd572d7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd572d7d Branch: refs/heads/trunk Commit: bd572d7d9b8433565b1afa0aac9106bbc6201b0b Parents: 5363189 db9eb04 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 11 13:44:34 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 11 13:44:34 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/CollationController.java | 39 +++++++++------ 2 files changed, 25 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd572d7d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0cbe968,2a70cec..4585dcc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +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 + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd572d7d/src/java/org/apache/cassandra/db/CollationController.java ----------------------------------------------------------------------
