natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Aleksey Yeschenko 2015-02-10 00:47:06 +03:00
parent aec423bce5 fd6f9c6f9c
commit 21c5a41f05
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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

10
debian/changelog vendored
View File

@ -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

2
src/java/org/apache/cassandra/service/CassandraDaemon.java
View File

@ -384,7 +384,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();