cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 19 May 2014 12:35:58 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/e05caaa8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e05caaa8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e05caaa8

Branch: refs/heads/trunk
Commit: e05caaa8cbec3ecd99bb7fc6ab12139e129cf225
Parents: 2a6aaca 518c3cf
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon May 19 14:33:54 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon May 19 14:33:54 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java   | 6 +++---
 .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java   | 9 +++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message