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/196e5146 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/196e5146 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/196e5146 Branch: refs/heads/trunk Commit: 196e5146d300986760fee83bc4fdcfb18e35bb5e Parents: 38d5178 681c380 Author: Tyler Hobbs <[email protected]> Authored: Tue Sep 16 13:22:50 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Tue Sep 16 13:22:50 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/QueryProcessor.java | 53 +++++++++++++------- .../cassandra/metrics/CqlStatementMetrics.java | 1 + 3 files changed, 36 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/196e5146/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/196e5146/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
