Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61a27af4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61a27af4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61a27af4 Branch: refs/heads/trunk Commit: 61a27af490a2ba6111baecaf5b12fd2ede3f64de Parents: 196e514 b319b40 Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Sep 16 14:10:25 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Sep 16 14:10:25 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../apache/cassandra/cql3/QueryProcessor.java | 53 +++++++------------- .../cassandra/metrics/CqlStatementMetrics.java | 1 - 3 files changed, 19 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61a27af4/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61a27af4/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
