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/992eff29 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/992eff29 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/992eff29 Branch: refs/heads/cassandra-2.1 Commit: 992eff2953ec9d90e37bb41c6fc46defc2e4611c Parents: ca7e9d5 6d8be12 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri May 23 14:09:07 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri May 23 14:09:07 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/metrics/FileCacheMetrics.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
