Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7852a3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7852a3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7852a3e Branch: refs/heads/trunk Commit: e7852a3e56daf2cc80075a914d06a11f8de76a55 Parents: 3572cfd f4449bd Author: Jason Brown <[email protected]> Authored: Thu Jun 25 10:45:43 2015 -0700 Committer: Jason Brown <[email protected]> Committed: Thu Jun 25 10:45:43 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/nodetool | 13 +++++++++++++ conf/cassandra-env.sh | 8 ++++++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 15 +++++++++++++++ 4 files changed, 38 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7852a3e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 290e22d,d2f40af..1fed6dd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +3.0: + * Improve log output from unit tests (CASSANDRA-9528) + * Add algorithmic token allocation (CASSANDRA-7032) + * Add nodetool command to replay batchlog (CASSANDRA-9547) + * Make file buffer cache independent of paths being read (CASSANDRA-8897) + * Remove deprecated legacy Hadoop code (CASSANDRA-9353) + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + * Populate TokenMetadata early during startup (CASSANDRA-9317) + * undeprecate cache recentHitRate (CASSANDRA-6591) + + 2.2 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) * Update cqlsh for UDFs (CASSANDRA-7556) * Change Windows kernel default timer resolution (CASSANDRA-9634) * Deprected sstable2json and json2sstable (CASSANDRA-9618) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7852a3e/conf/cassandra-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7852a3e/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java index db22208,dbe1fe6..e9a51d1 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@@ -49,10 -52,9 +52,11 @@@ import javax.management.openmbean.Tabul import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; + import javax.rmi.ssl.SslRMIClientSocketFactory; import org.apache.cassandra.concurrent.Stage; +import org.apache.cassandra.db.BatchlogManager; +import org.apache.cassandra.db.BatchlogManagerMBean; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.db.HintedHandOffManager; import org.apache.cassandra.db.HintedHandOffManagerMBean;
