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/d143206d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d143206d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d143206d Branch: refs/heads/trunk Commit: d143206dc84f26ec5005e03fd465f400cdf13241 Parents: 5c408af 6bd71a5 Author: Sylvain Lebresne <[email protected]> Authored: Tue Oct 15 18:15:20 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Oct 15 18:15:20 2013 +0200 ---------------------------------------------------------------------- .../apache/cassandra/metrics/ClientMetrics.java | 18 ++++++++++++++++++ .../org/apache/cassandra/pig/CqlTableTest.java | 18 ++++++++++++++++++ .../org/apache/cassandra/pig/PigTestBase.java | 18 ++++++++++++++++++ .../cassandra/pig/ThriftColumnFamilyTest.java | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+) ----------------------------------------------------------------------
