From c1a2e0fa585877c057b7a8958adeacf6a589c126 Mon Sep 17 00:00:00 2001 From: T Jake Luciani Date: Mon, 9 Feb 2015 10:35:28 -0500 Subject: [PATCH 1/2] bump debian release --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83c85dd6f5..339da0ce6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -cassandra (2.1.2) UNRELEASED; urgency=medium +cassandra (2.1.3) unstable; urgency=medium * New release - -- Jake Luciani Wed, 05 Nov 2014 15:51:26 -0500 + -- Jake Luciani Mon, 09 Feb 2015 10:31:35 -0500 + +cassandra (2.1.2) unstable; urgency=medium + + * New release + + -- Jake Luciani Wed, 05 Nov 2014 15:51:26 -0500 cassandra (2.1.1) unstable; urgency=medium From fd6f9c6f9c15ab28d0db0edef1f84faaa7ea42c5 Mon Sep 17 00:00:00 2001 From: Aleksey Yeschenko Date: Tue, 10 Feb 2015 00:46:29 +0300 Subject: [PATCH 2/2] Disable CASSANDRA-7688 until DT is fixed --- CHANGES.txt | 1 - src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5b23d87d35..d44d70d9f3 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 diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 1198b3ed57..50c8295928 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();