Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt src/java/org/apache/cassandra/tools/NodeProbe.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4449bd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4449bd4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4449bd4 Branch: refs/heads/cassandra-2.2 Commit: f4449bd455650cacec480bb5a4d6c12f5a3a6b8e Parents: 8b9c91e 628394a Author: Jason Brown <jasedbr...@gmail.com> Authored: Thu Jun 25 10:45:02 2015 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Jun 25 10:45:02 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/f4449bd4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 59f1c18,fded5fc..d2f40af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,22 @@@ -2.1.7 +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) + * Allow native functions in user-defined aggregates (CASSANDRA-9542) + * Don't repair system_distributed by default (CASSANDRA-9621) + * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622) + * Rename class for DATE type in Java driver (CASSANDRA-9563) + * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475) + * Fix connection leak in CqlRecordWriter (CASSANDRA-9576) + * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573) + * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229) + * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) + * Fix deprecated repair JMX API (CASSANDRA-9570) + * Add logback metrics (CASSANDRA-9378) + * Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583) +Merged from 2.1: ++ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540) * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637) * Fix bug in cardinality check when compacting (CASSANDRA-9580) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4449bd4/conf/cassandra-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4449bd4/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java index 14215dc,d3bce4d..dbe1fe6 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@@ -25,8 -27,13 +25,11 @@@ import java.lang.management.MemoryUsage import java.lang.management.RuntimeMXBean; import java.net.InetAddress; import java.net.UnknownHostException; + import java.rmi.server.RMIClientSocketFactory; + import java.rmi.server.RMISocketFactory; + import java.text.SimpleDateFormat; import java.util.AbstractMap; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@@ -49,8 -59,10 +52,9 @@@ 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.JMXEnabledThreadPoolExecutorMBean; +import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.db.HintedHandOffManager; import org.apache.cassandra.db.HintedHandOffManagerMBean;