Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae782319 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae782319 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae782319 Branch: refs/heads/trunk Commit: ae782319b59266080cc85b3fd3210cdf39a4353a Parents: c3a1a4f 10ca7e4 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Tue Dec 5 16:06:15 2017 -0800 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Tue Dec 5 16:06:15 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/locator/DynamicEndpointSnitch.java | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae782319/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7c0af91,cf8883a..60215c4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,14 @@@ +3.11.2 + * Remove OpenJDK log warning (CASSANDRA-13916) + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079) + * Cache disk boundaries (CASSANDRA-13215) + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) +Merged from 3.0: + 3.0.16 + * Reduce garbage created by DynamicSnitch (CASSANDRA-14091) * More frequent commitlog chained markers (CASSANDRA-13987) * Fix serialized size of DataLimits (CASSANDRA-14057) * Add flag to allow dropping oversized read repair mutations (CASSANDRA-13975) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae782319/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java index e9c8e6f,8c255f5..42fc26c --- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java +++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java @@@ -30,12 -29,9 +30,13 @@@ import com.codahale.metrics.Exponential import javax.management.MBeanServer; import javax.management.ObjectName; + import com.codahale.metrics.Snapshot; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.gms.ApplicationState; +import org.apache.cassandra.gms.EndpointState; +import org.apache.cassandra.gms.Gossiper; +import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
