cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 18 Sep 2014 04:04:54 GMT
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/a8285fea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8285fea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8285fea

Branch: refs/heads/trunk
Commit: a8285fea60a1bad92fa598c0a2a51eff4575394d
Parents: 48682d6 ad89d44
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Sep 17 21:04:00 2014 -0700
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Sep 17 21:04:00 2014 -0700

----------------------------------------------------------------------
 .../apache/cassandra/cql3/QueryProcessor.java   |  48 +++----
 .../apache/cassandra/metrics/CQLMetrics.java    |  60 +++++++++
 .../cassandra/metrics/CqlStatementMetrics.java  |  53 --------
 .../apache/cassandra/cql3/CqlMetricsTest.java   | 114 -----------------
 .../cassandra/metrics/CQLMetricsTest.java       | 124 +++++++++++++++++++
 5 files changed, 203 insertions(+), 196 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8285fea/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------


Mime
View raw message