You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/12/04 19:20:39 UTC
[22/22] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.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/084590c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/084590c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/084590c4
Branch: refs/heads/trunk
Commit: 084590c4134a022dc9da05e6f97da882b33b9854
Parents: de3f239 be99f44
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 13:19:33 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 13:19:33 2015 -0500
----------------------------------------------------------------------
.../db/SinglePartitionReadCommand.java | 4 +-
.../metrics/CASClientRequestMetrics.java | 2 +-
.../metrics/CassandraMetricsRegistry.java | 10 ++--
.../metrics/EstimatedHistogramReservoir.java | 10 ++--
.../cassandra/metrics/KeyspaceMetrics.java | 8 +--
.../apache/cassandra/metrics/TableMetrics.java | 21 +++----
.../cassandra/utils/EstimatedHistogram.java | 31 +++++++---
.../org/apache/cassandra/db/RowCacheTest.java | 49 ++++++++++++++++
.../cassandra/utils/EstimatedHistogramTest.java | 59 ++++++++++++++++++--
9 files changed, 155 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/084590c4/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/084590c4/src/java/org/apache/cassandra/metrics/TableMetrics.java
----------------------------------------------------------------------