You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/03 00:00:37 UTC
[01/14] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 a4d7e227d -> 3ca740119
refs/heads/cassandra-2.0 05b2ae84c -> 5e51aa4e6
refs/heads/cassandra-2.1 c749b88ed -> 895c68ef5
refs/heads/trunk 1c8e9e876 -> 23f18595a
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c749b88e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c749b88e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c749b88e
Branch: refs/heads/trunk
Commit: c749b88edd95483903f40387577a70ea6c9cb39f
Parents: 2d60732 05b2ae8
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:46:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:46:55 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c749b88e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[10/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e51aa4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e51aa4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e51aa4e
Branch: refs/heads/trunk
Commit: 5e51aa4e6d1d868bb82a1aa2ffaed4613b24ffc1
Parents: 60079af
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:08 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e51aa4e/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index b53449c..ef1dee9 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -85,8 +85,11 @@ public class LatencyMetrics
public void addNano(long nanos)
{
// convert to microseconds. 1 millionth
- latency.update(nanos, TimeUnit.NANOSECONDS);
- totalLatency.inc(nanos / 1000);
+ synchronized (this)
+ {
+ latency.update(nanos, TimeUnit.NANOSECONDS);
+ totalLatency.inc(nanos / 1000);
+ }
totalLatencyHistogram.add(nanos / 1000);
recentLatencyHistogram.add(nanos / 1000);
}
@@ -100,8 +103,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[12/14] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/895c68ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/895c68ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/895c68ef
Branch: refs/heads/cassandra-2.1
Commit: 895c68ef5e647b446fc445155a4586429fad631a
Parents: c749b88 5e51aa4
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:46 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:46 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[04/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ca74011
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ca74011
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ca74011
Branch: refs/heads/cassandra-2.0
Commit: 3ca740119e7b402a453a2fb43ee904a0ee313ff0
Parents: a4d7e22
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:54:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:54:40 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca74011/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index 01ba997..c2c48f2 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -90,8 +90,11 @@ public class LatencyMetrics
public void addMicro(long micros)
{
- latency.update(micros, TimeUnit.MICROSECONDS);
- totalLatency.inc(micros);
+ synchronized (this)
+ {
+ latency.update(micros, TimeUnit.MICROSECONDS);
+ totalLatency.inc(micros);
+ }
totalLatencyHistogram.add(micros);
recentLatencyHistogram.add(micros);
}
@@ -105,8 +108,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[03/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ca74011
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ca74011
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ca74011
Branch: refs/heads/trunk
Commit: 3ca740119e7b402a453a2fb43ee904a0ee313ff0
Parents: a4d7e22
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:54:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:54:40 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca74011/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index 01ba997..c2c48f2 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -90,8 +90,11 @@ public class LatencyMetrics
public void addMicro(long micros)
{
- latency.update(micros, TimeUnit.MICROSECONDS);
- totalLatency.inc(micros);
+ synchronized (this)
+ {
+ latency.update(micros, TimeUnit.MICROSECONDS);
+ totalLatency.inc(micros);
+ }
totalLatencyHistogram.add(micros);
recentLatencyHistogram.add(micros);
}
@@ -105,8 +108,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[07/14] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60079af6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60079af6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60079af6
Branch: refs/heads/trunk
Commit: 60079af67ddfdf2528d205f36f62667a4fc6aa73
Parents: 05b2ae8 3ca7401
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:55:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:55:29 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ca74011
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ca74011
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ca74011
Branch: refs/heads/cassandra-2.1
Commit: 3ca740119e7b402a453a2fb43ee904a0ee313ff0
Parents: a4d7e22
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:54:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:54:40 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca74011/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index 01ba997..c2c48f2 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -90,8 +90,11 @@ public class LatencyMetrics
public void addMicro(long micros)
{
- latency.update(micros, TimeUnit.MICROSECONDS);
- totalLatency.inc(micros);
+ synchronized (this)
+ {
+ latency.update(micros, TimeUnit.MICROSECONDS);
+ totalLatency.inc(micros);
+ }
totalLatencyHistogram.add(micros);
recentLatencyHistogram.add(micros);
}
@@ -105,8 +108,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[02/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ca74011
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ca74011
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ca74011
Branch: refs/heads/cassandra-1.2
Commit: 3ca740119e7b402a453a2fb43ee904a0ee313ff0
Parents: a4d7e22
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:54:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:54:40 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca74011/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index 01ba997..c2c48f2 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -90,8 +90,11 @@ public class LatencyMetrics
public void addMicro(long micros)
{
- latency.update(micros, TimeUnit.MICROSECONDS);
- totalLatency.inc(micros);
+ synchronized (this)
+ {
+ latency.update(micros, TimeUnit.MICROSECONDS);
+ totalLatency.inc(micros);
+ }
totalLatencyHistogram.add(micros);
recentLatencyHistogram.add(micros);
}
@@ -105,8 +108,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[09/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e51aa4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e51aa4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e51aa4e
Branch: refs/heads/cassandra-2.1
Commit: 5e51aa4e6d1d868bb82a1aa2ffaed4613b24ffc1
Parents: 60079af
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:08 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e51aa4e/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index b53449c..ef1dee9 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -85,8 +85,11 @@ public class LatencyMetrics
public void addNano(long nanos)
{
// convert to microseconds. 1 millionth
- latency.update(nanos, TimeUnit.NANOSECONDS);
- totalLatency.inc(nanos / 1000);
+ synchronized (this)
+ {
+ latency.update(nanos, TimeUnit.NANOSECONDS);
+ totalLatency.inc(nanos / 1000);
+ }
totalLatencyHistogram.add(nanos / 1000);
recentLatencyHistogram.add(nanos / 1000);
}
@@ -100,8 +103,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[06/14] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60079af6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60079af6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60079af6
Branch: refs/heads/cassandra-2.1
Commit: 60079af67ddfdf2528d205f36f62667a4fc6aa73
Parents: 05b2ae8 3ca7401
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:55:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:55:29 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/14] git commit: Fix LatencyMetrics returning infinity.
Posted by br...@apache.org.
Fix LatencyMetrics returning infinity.
Patch by Nick Bailey, reviewed by Lyuben Todorov for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e51aa4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e51aa4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e51aa4e
Branch: refs/heads/cassandra-2.0
Commit: 5e51aa4e6d1d868bb82a1aa2ffaed4613b24ffc1
Parents: 60079af
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:08 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e51aa4e/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index b53449c..ef1dee9 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -85,8 +85,11 @@ public class LatencyMetrics
public void addNano(long nanos)
{
// convert to microseconds. 1 millionth
- latency.update(nanos, TimeUnit.NANOSECONDS);
- totalLatency.inc(nanos / 1000);
+ synchronized (this)
+ {
+ latency.update(nanos, TimeUnit.NANOSECONDS);
+ totalLatency.inc(nanos / 1000);
+ }
totalLatencyHistogram.add(nanos / 1000);
recentLatencyHistogram.add(nanos / 1000);
}
@@ -100,8 +103,13 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = latency.count();
- long n = totalLatency.count();
+ long ops = 0;
+ long n = 0;
+ synchronized (this)
+ {
+ ops = latency.count();
+ n = totalLatency.count();
+ }
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[08/14] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60079af6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60079af6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60079af6
Branch: refs/heads/cassandra-2.0
Commit: 60079af67ddfdf2528d205f36f62667a4fc6aa73
Parents: 05b2ae8 3ca7401
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:55:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:55:29 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/14] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23f18595
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23f18595
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23f18595
Branch: refs/heads/trunk
Commit: 23f18595a996d121837bfaedd34f71f1ea39e093
Parents: 1c8e9e8 895c68e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:55 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[13/14] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/895c68ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/895c68ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/895c68ef
Branch: refs/heads/trunk
Commit: 895c68ef5e647b446fc445155a4586429fad631a
Parents: c749b88 5e51aa4
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:46 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:46 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------