Updated Branches: refs/heads/cassandra-1.2 3ff0c81f6 -> 1c2a69c35 refs/heads/trunk 049352f9b -> c7366c508
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/c7366c50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7366c50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7366c50 Branch: refs/heads/trunk Commit: c7366c5086dea0c66a235b1a7023ec6a634cecfc Parents: 049352f 1c2a69c Author: Jonathan Ellis <[email protected]> Authored: Wed Jan 9 15:58:25 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jan 9 15:58:25 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 3 ++- .../cassandra/db/compaction/CompactionManager.java | 11 ++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7366c50/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dd3826c,a4d7963..4553340 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +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) + * replace supercolumns internally by composites (CASSANDRA-3237) + + 1.2.1 + * fix validation compaction of empty rows (CASSADRA-5136) * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750) * disallow bloom filter false positive chance of 0 (CASSANDRA-5013) * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7366c50/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
