Updated Branches: refs/heads/cassandra-1.2 38757c4b2 -> e19cdaa1f refs/heads/trunk e8eb0e689 -> f802882c9
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/f802882c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f802882c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f802882c Branch: refs/heads/trunk Commit: f802882c9f4377f4986aa658e748d3a462382a22 Parents: e8eb0e6 e19cdaa Author: Jonathan Ellis <[email protected]> Authored: Thu Dec 27 09:32:48 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Dec 27 09:32:48 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/Throttle.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f802882c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2f6fe39,2061c29..bad3a3a --- 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 + * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087) * fix hinting for dropped local writes (CASSANDRA-4753) * off-heap cache doesn't need mutable column container (CASSANDRA-5057) * apply disk_failure_policy to bad disks on initial directory creation
