Merge branch 'cassandra-2.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/458bcf23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/458bcf23 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/458bcf23 Branch: refs/heads/trunk Commit: 458bcf238d3a5ad8f3b756e8806ca63bf0057aeb Parents: 7263584 5c86f36 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Jan 11 07:47:56 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Jan 11 07:47:56 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/458bcf23/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java ----------------------------------------------------------------------
