cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Thu, 21 May 2015 12:47:12 GMT
Merge branch 'cassandra-2.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/615c1bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/615c1bac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/615c1bac

Branch: refs/heads/trunk
Commit: 615c1bac6283ab098ab33cc01c25ca92191ee395
Parents: 63da823 868e720
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Thu May 21 13:43:09 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Thu May 21 13:43:09 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  1 -
 src/java/org/apache/cassandra/db/Memtable.java  |  5 +++++
 .../cassandra/metrics/ColumnFamilyMetrics.java  | 20 +++++++++++++++++---
 .../org/apache/cassandra/tools/NodeProbe.java   |  1 +
 .../cassandra/tools/nodetool/TableStats.java    |  7 ++-----
 6 files changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/615c1bac/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message