Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
src/java/org/apache/cassandra/metrics/StreamingMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c15ac661
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c15ac661
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c15ac661
Branch: refs/heads/trunk
Commit: c15ac661dbe8cff7a22fffa22045867e4bf7bbcc
Parents: 8a03181 86a3802
Author: Robert Stupp <[email protected]>
Authored: Wed Mar 25 11:46:00 2015 +0100
Committer: Robert Stupp <[email protected]>
Committed: Wed Mar 25 11:46:00 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/metrics/ConnectionMetrics.java | 2 +-
src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java | 4 ++--
src/java/org/apache/cassandra/metrics/StreamingMetrics.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c15ac661/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c15ac661/src/java/org/apache/cassandra/metrics/ConnectionMetrics.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c15ac661/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
index d3d8388,ea81a9a..e44279a
--- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
@@@ -56,7 -55,7 +56,7 @@@ public class HintedHandoffMetric
{
public Counter load(InetAddress address)
{
- return Metrics.counter(factory.createMetricName("Hints_created-"
+ address.getHostAddress()));
- return
Metrics.newCounter(factory.createMetricName("Hints_created-" +
address.getHostAddress().replace(':', '.')));
++ return Metrics.counter(factory.createMetricName("Hints_created-"
+ address.getHostAddress().replace(':', '.')));
}
});
@@@ -89,7 -88,7 +89,7 @@@
public DifferencingCounter(InetAddress address)
{
- this.meter =
Metrics.counter(factory.createMetricName("Hints_not_stored-" +
address.getHostAddress()));
- this.meter =
Metrics.newCounter(factory.createMetricName("Hints_not_stored-" +
address.getHostAddress().replace(':', '.')));
++ this.meter =
Metrics.counter(factory.createMetricName("Hints_not_stored-" +
address.getHostAddress().replace(':', '.')));
}
public long difference()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c15ac661/src/java/org/apache/cassandra/metrics/StreamingMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/StreamingMetrics.java
index d00513c,4c57812..72e9b23
--- a/src/java/org/apache/cassandra/metrics/StreamingMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/StreamingMetrics.java
@@@ -54,8 -52,8 +54,8 @@@ public class StreamingMetric
public StreamingMetrics(final InetAddress peer)
{
- MetricNameFactory factory = new DefaultNameFactory("Streaming",
peer.getHostAddress().replaceAll(":", "."));
+ MetricNameFactory factory = new DefaultNameFactory("Streaming",
peer.getHostAddress().replace(':', '.'));
- incomingBytes =
Metrics.newCounter(factory.createMetricName("IncomingBytes"));
- outgoingBytes=
Metrics.newCounter(factory.createMetricName("OutgoingBytes"));
+ incomingBytes =
Metrics.counter(factory.createMetricName("IncomingBytes"));
+ outgoingBytes=
Metrics.counter(factory.createMetricName("OutgoingBytes"));
}
}
