Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c43b8c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c43b8c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c43b8c3
Branch: refs/heads/cassandra-3.0
Commit: 8c43b8c3feb507ce43254a620060467087c7f12b
Parents: 0d2f403 57d48a9
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Aug 31 16:42:08 2015 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Aug 31 16:42:08 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++
.../org/apache/cassandra/tools/NodeProbe.java | 2 ++
.../org/apache/cassandra/tools/NodeTool.java | 1 +
.../tools/nodetool/GetTraceProbability.java | 33 ++++++++++++++++++++
4 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c43b8c3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 37244c9,d57eaf7..d9f8a50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,11 +1,32 @@@
-2.1.10
+2.2.2
+ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
+ (CASSANDRA-10199)
+Merged from 2.1:
* Only check KeyCache when it is enabled
+ * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
+ * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
+ * Add nodetool gettraceprobability command (CASSANDRA-10234)
-2.1.9
+2.2.1
+ * Fix race during construction of commit log (CASSANDRA-10049)
+ * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
+ * Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
+ * (cqlsh) add CLEAR command (CASSANDRA-10086)
+ * Support string literals as Role names for compatibility (CASSANDRA-10135)
+ * Allow count(*) and count(1) to be use as normal aggregation
(CASSANDRA-10114)
+ * An NPE is thrown if the column name is unknown for an IN relation
(CASSANDRA-10043)
+ * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
+ * Fix histogram overflow exception (CASSANDRA-9973)
+ * Route gossip messages over dedicated socket (CASSANDRA-9237)
+ * Add checksum to saved cache files (CASSANDRA-9265)
+ * Log warning when using an aggregate without partition key (CASSANDRA-9737)
+ * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
+ * UDF / UDA execution time in trace (CASSANDRA-9723)
+ * Fix broken internode SSL (CASSANDRA-9884)
+Merged from 2.1:
+ * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
+ * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
* Avoid race condition during read repair (CASSANDRA-9460)
* (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
* Avoid returning Permission.NONE when failing to query users table
(CASSANDRA-10168)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c43b8c3/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 2b256bd,51b1c93..ebbef7d
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -930,9 -971,11 +930,11 @@@ public class NodeProbe implements AutoC
return ssProxy.getStreamThroughputMbPerSec();
}
+ public double getTraceProbability() {return
ssProxy.getTraceProbability();}
+
public int getExceptionCount()
{
- return ssProxy.getExceptionCount();
+ return (int)StorageMetrics.exceptions.getCount();
}
public Map<String, Integer> getDroppedMessages()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c43b8c3/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
