Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c1a2e0fa5 -> fd6f9c6f9
Disable CASSANDRA-7688 until DT is fixed Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd6f9c6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd6f9c6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd6f9c6f Branch: refs/heads/cassandra-2.1 Commit: fd6f9c6f9c15ab28d0db0edef1f84faaa7ea42c5 Parents: c1a2e0f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Feb 10 00:46:29 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Feb 10 00:46:29 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 - src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd6f9c6f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5b23d87..d44d70d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,4 @@ 2.1.3 - * Write partition size estimates into a system table (CASSANDRA-7688) * Upgrade libthrift to 0.9.2 (CASSANDRA-8685) * Don't use the shared ref in sstableloader (CASSANDRA-8704) * Purge internal prepared statements if related tables or http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd6f9c6f/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 1198b3e..50c8295 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -366,7 +366,7 @@ public class CassandraDaemon waitForGossipToSettle(); // schedule periodic dumps of table size estimates into SystemKeyspace.SIZE_ESTIMATES_CF - ScheduledExecutors.optionalTasks.scheduleWithFixedDelay(SizeEstimatesRecorder.instance, 30, 5 * 60, TimeUnit.SECONDS); + // ScheduledExecutors.optionalTasks.scheduleWithFixedDelay(SizeEstimatesRecorder.instance, 30, 5 * 60, TimeUnit.SECONDS); // Thrift InetAddress rpcAddr = DatabaseDescriptor.getRpcAddress();