You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2016/06/14 15:13:59 UTC
[1/3] cassandra git commit: Fix example metrics
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 972157d98 -> 3c531cbec
refs/heads/trunk 5514110e0 -> 60e5e0ef4
Fix example metrics
Patch by cbate; reviewed by jmckenzie for CASSANDRA-11481
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c531cbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c531cbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c531cbe
Branch: refs/heads/cassandra-3.0
Commit: 3c531cbec97be94e33c9b6872e2c568d5d8bf835
Parents: 972157d
Author: Josh McKenzie <jm...@apache.org>
Authored: Tue Jun 14 10:59:08 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Tue Jun 14 11:13:31 2016 -0400
----------------------------------------------------------------------
conf/metrics-reporter-config-sample.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c531cbe/conf/metrics-reporter-config-sample.yaml
----------------------------------------------------------------------
diff --git a/conf/metrics-reporter-config-sample.yaml b/conf/metrics-reporter-config-sample.yaml
index 34b1d7e..54f2657 100644
--- a/conf/metrics-reporter-config-sample.yaml
+++ b/conf/metrics-reporter-config-sample.yaml
@@ -35,7 +35,7 @@ console:
- "^org.apache.cassandra.metrics.ClientRequest.+" # includes ClientRequestMetrics
- "^org.apache.cassandra.metrics.CommitLog.+"
- "^org.apache.cassandra.metrics.Compaction.+"
- - "^org.apache.cassandra.metrics.DroppedMetrics.+"
+ - "^org.apache.cassandra.metrics.DroppedMessage.+"
- "^org.apache.cassandra.metrics.ReadRepair.+"
- "^org.apache.cassandra.metrics.Storage.+"
- "^org.apache.cassandra.metrics.ThreadPools.+"
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e5e0ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e5e0ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e5e0ef
Branch: refs/heads/trunk
Commit: 60e5e0ef4c6c9dbbb6c81fce07fec26433b57a69
Parents: 5514110 3c531cb
Author: Josh McKenzie <jm...@apache.org>
Authored: Tue Jun 14 11:13:42 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Tue Jun 14 11:13:42 2016 -0400
----------------------------------------------------------------------
conf/metrics-reporter-config-sample.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Fix example metrics
Posted by jm...@apache.org.
Fix example metrics
Patch by cbate; reviewed by jmckenzie for CASSANDRA-11481
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c531cbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c531cbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c531cbe
Branch: refs/heads/trunk
Commit: 3c531cbec97be94e33c9b6872e2c568d5d8bf835
Parents: 972157d
Author: Josh McKenzie <jm...@apache.org>
Authored: Tue Jun 14 10:59:08 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Tue Jun 14 11:13:31 2016 -0400
----------------------------------------------------------------------
conf/metrics-reporter-config-sample.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c531cbe/conf/metrics-reporter-config-sample.yaml
----------------------------------------------------------------------
diff --git a/conf/metrics-reporter-config-sample.yaml b/conf/metrics-reporter-config-sample.yaml
index 34b1d7e..54f2657 100644
--- a/conf/metrics-reporter-config-sample.yaml
+++ b/conf/metrics-reporter-config-sample.yaml
@@ -35,7 +35,7 @@ console:
- "^org.apache.cassandra.metrics.ClientRequest.+" # includes ClientRequestMetrics
- "^org.apache.cassandra.metrics.CommitLog.+"
- "^org.apache.cassandra.metrics.Compaction.+"
- - "^org.apache.cassandra.metrics.DroppedMetrics.+"
+ - "^org.apache.cassandra.metrics.DroppedMessage.+"
- "^org.apache.cassandra.metrics.ReadRepair.+"
- "^org.apache.cassandra.metrics.Storage.+"
- "^org.apache.cassandra.metrics.ThreadPools.+"