Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39c78692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39c78692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39c78692 Branch: refs/heads/cassandra-2.2 Commit: 39c78692bef55acdc31badb89dee487913196765 Parents: bf08e66 e8f2cb5 Author: Sam Tunnicliffe <[email protected]> Authored: Fri Aug 7 15:43:12 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Aug 7 15:43:12 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../JMXEnabledScheduledThreadPoolExecutor.java | 137 ------------------- ...EnabledScheduledThreadPoolExecutorMBean.java | 26 ---- .../cassandra/db/HintedHandOffManager.java | 29 +++- 4 files changed, 23 insertions(+), 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c78692/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6e17be0,781b60e..98c8d73 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -31,8 -10,14 +31,9 @@@ Merged from 2.1 * Fix clientutil jar and tests (CASSANDRA-9760) * (cqlsh) Allow the SSL protocol version to be specified through the config file or environment variables (CASSANDRA-9544) - * Remove repair snapshot leftover on startup (CASSANDRA-7357) - * Use random nodes for batch log when only 2 racks (CASSANDRA-8735) - * Ensure atomicity inside thrift and stream session (CASSANDRA-7757) - * Fix nodetool info error when the node is not joined (CASSANDRA-9031) Merged from 2.0: + * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129) * Don't cast expected bf size to an int (CASSANDRA-9959) - * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793) * checkForEndpointCollision fails for legitimate collisions (CASSANDRA-9765) * Complete CASSANDRA-8448 fix (CASSANDRA-9519) * Don't include auth credentials in debug log (CASSANDRA-9682) http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c78692/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java index df8820b,6f9d0b1..dae85b7 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@@ -37,8 -37,10 +37,9 @@@ import com.google.common.util.concurren import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.cassandra.concurrent.JMXEnabledScheduledThreadPoolExecutor; + import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor; + import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor; import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.compaction.CompactionManager;
