You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2013/08/13 20:21:24 UTC
[01/13] git commit: make sure to release recently added CF metric
Updated Branches:
refs/heads/cassandra-1.2 44925ac7e -> 2d2099751
refs/heads/cassandra-2.0 89fc57674 -> 9a154a9ab
refs/heads/cassandra-2.0.0 171605423 -> 42b260246
refs/heads/trunk 129d50dbe -> bcd6a6b64
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d209975
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d209975
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d209975
Branch: refs/heads/cassandra-1.2
Commit: 2d2099751c63149f21b5635e0e290722b2ae92d3
Parents: 44925ac
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:02 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:28 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d209975/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index d59cd50..d111667 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -330,6 +330,7 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[11/13] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0.0' 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/9a154a9a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a154a9a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a154a9a
Branch: refs/heads/trunk
Commit: 9a154a9ab949da5860b7d1d633792bb4edccdf73
Parents: 89fc576 42b2602
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:17:59 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:17:59 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[08/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by yu...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42b26024
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42b26024
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42b26024
Branch: refs/heads/cassandra-2.0
Commit: 42b260246eb55812aa8260606605d335277f1c48
Parents: e15dee2 2d20997
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:17:13 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:17:13 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/13] git commit: make sure to release recently added CF metric
Posted by yu...@apache.org.
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d209975
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d209975
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d209975
Branch: refs/heads/cassandra-2.0
Commit: 2d2099751c63149f21b5635e0e290722b2ae92d3
Parents: 44925ac
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:02 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:28 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d209975/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index d59cd50..d111667 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -330,6 +330,7 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[13/13] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcd6a6b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd6a6b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd6a6b6
Branch: refs/heads/trunk
Commit: bcd6a6b64096a9837c3f9c4247dcfa756344c6f1
Parents: 129d50d 9a154a9
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:21:11 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:21:11 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd6a6b6/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 0b1e5de,0f9f87d..ce870c7
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -328,25 -314,27 +328,27 @@@ public class ColumnFamilyMetric
{
readLatency.release();
writeLatency.release();
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableColumnsCount"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableDataSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("CompressionRatio"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("EstimatedRowSizeHistogram"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("EstimatedColumnCountHistogram"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("SSTablesPerReadHistogram"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("PendingTasks"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveSSTableCount"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveDiskSpaceUsed"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("TotalDiskSpaceUsed"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MinRowSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MaxRowSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("MeanRowSize"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalsePositives"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalsePositives"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
- Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetry"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MemtableColumnsCount"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MemtableDataSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MemtableSwitchCount"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("CompressionRatio"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("EstimatedRowSizeHistogram"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("EstimatedColumnCountHistogram"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("SSTablesPerReadHistogram"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("PendingTasks"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("LiveSSTableCount"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("LiveDiskSpaceUsed"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("TotalDiskSpaceUsed"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MinRowSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MaxRowSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("MeanRowSize"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("BloomFilterFalsePositives"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("RecentBloomFilterFalsePositives"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("BloomFilterFalseRatio"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("RecentBloomFilterFalseRatio"));
+ CassandraMetricRegistry.unregister(factory.createMetricName("BloomFilterDiskSpaceUsed"));
++ CassandraMetricRegistry.unregister(factory.createMetricName("KeyCacheHitRate"));
++ CassandraMetricRegistry.unregister(factory.createMetricName("SpeculativeRetry"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[05/13] git commit: make sure to release recently added CF metric
Posted by yu...@apache.org.
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e15dee2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e15dee2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e15dee2f
Branch: refs/heads/cassandra-2.0.0
Commit: e15dee2f4a92b1d0822f229488d89a405b4ef0cb
Parents: 1716054
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:59 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:59 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e15dee2f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 96ab538..0f9f87d 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -333,6 +333,8 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetry"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[07/13] git commit: make sure to release recently added CF metric
Posted by yu...@apache.org.
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e15dee2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e15dee2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e15dee2f
Branch: refs/heads/cassandra-2.0
Commit: e15dee2f4a92b1d0822f229488d89a405b4ef0cb
Parents: 1716054
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:59 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:59 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e15dee2f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 96ab538..0f9f87d 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -333,6 +333,8 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetry"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[04/13] git commit: make sure to release recently added CF metric
Posted by yu...@apache.org.
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d209975
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d209975
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d209975
Branch: refs/heads/cassandra-2.0.0
Commit: 2d2099751c63149f21b5635e0e290722b2ae92d3
Parents: 44925ac
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:02 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:28 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d209975/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index d59cd50..d111667 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -330,6 +330,7 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[06/13] git commit: make sure to release recently added CF metric
Posted by yu...@apache.org.
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e15dee2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e15dee2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e15dee2f
Branch: refs/heads/trunk
Commit: e15dee2f4a92b1d0822f229488d89a405b4ef0cb
Parents: 1716054
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:59 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:59 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e15dee2f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 96ab538..0f9f87d 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -333,6 +333,8 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetry"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[02/13] git commit: make sure to release recently added CF metric
Posted by yu...@apache.org.
make sure to release recently added CF metric
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d209975
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d209975
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d209975
Branch: refs/heads/trunk
Commit: 2d2099751c63149f21b5635e0e290722b2ae92d3
Parents: 44925ac
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:16:02 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:16:28 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d209975/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index d59cd50..d111667 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -330,6 +330,7 @@ public class ColumnFamilyMetrics
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
+ Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
}
class ColumnFamilyMetricNameFactory implements MetricNameFactory
[10/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by yu...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42b26024
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42b26024
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42b26024
Branch: refs/heads/cassandra-2.0.0
Commit: 42b260246eb55812aa8260606605d335277f1c48
Parents: e15dee2 2d20997
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:17:13 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:17:13 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/13] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0.0' 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/9a154a9a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a154a9a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a154a9a
Branch: refs/heads/cassandra-2.0
Commit: 9a154a9ab949da5860b7d1d633792bb4edccdf73
Parents: 89fc576 42b2602
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:17:59 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:17:59 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[09/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by yu...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42b26024
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42b26024
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42b26024
Branch: refs/heads/trunk
Commit: 42b260246eb55812aa8260606605d335277f1c48
Parents: e15dee2 2d20997
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Aug 13 13:17:13 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Aug 13 13:17:13 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------