Merge branch 'cassandra-2.1' into trunk

apache · Feb 9, 2015 · 21c5a41 · 21c5a41
2 parents aec423b + fd6f9c6
commit 21c5a41
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -58,7 +58,6 @@
 
 
 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/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 <jake@ubuntuosx>  Wed, 05 Nov 2014 15:51:26 -0500
+ -- Jake Luciani <jake@apache.org>  Mon, 09 Feb 2015 10:31:35 -0500
+
+cassandra (2.1.2) unstable; urgency=medium
+
+  * New release 
+
+ -- Jake Luciani <jake@apache.org>  Wed, 05 Nov 2014 15:51:26 -0500 
 
 cassandra (2.1.1) unstable; urgency=medium
 

diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -384,7 +384,7 @@ public void run()
             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();