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/ee4b50ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee4b50ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee4b50ca Branch: refs/heads/trunk Commit: ee4b50ca8b6b18494a1bfcc3d223a142214b01d0 Parents: 6d099b4 c3b7669 Author: Jonathan Ellis <[email protected]> Authored: Sat Sep 28 12:16:59 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sat Sep 28 12:16:59 2013 -0500 ---------------------------------------------------------------------- .../cassandra/metrics/RestorableMeter.java | 185 +++++++++++++++++++ 1 file changed, 185 insertions(+) ----------------------------------------------------------------------
