Updated Branches: refs/heads/cassandra-1.2 1d96e32b8 -> 8219195d0 refs/heads/trunk 04ade2ffa -> e0e45a4fe
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/e0e45a4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0e45a4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0e45a4f Branch: refs/heads/trunk Commit: e0e45a4fe7ebb71ebd58f9534b0e92825c63f721 Parents: 04ade2f 8219195 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 28 12:09:18 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 28 12:09:18 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../concurrent/JMXEnabledThreadPoolExecutor.java | 20 +++++++ .../JMXEnabledThreadPoolExecutorMBean.java | 20 +++++++ .../cassandra/db/compaction/CompactionManager.java | 40 +++++++++++++ .../db/compaction/CompactionManagerMBean.java | 44 +++++++++++++++ 5 files changed, 126 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0e45a4f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 96b479b,ca4780a..a2e44f4 --- 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 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and + CompactionManagerMBean (CASSANDRA-5044) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0e45a4f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
