Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E937710C94 for ; Fri, 9 Aug 2013 19:36:23 +0000 (UTC) Received: (qmail 7791 invoked by uid 500); 9 Aug 2013 19:36:21 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 7518 invoked by uid 500); 9 Aug 2013 19:36:19 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 7413 invoked by uid 99); 9 Aug 2013 19:36:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Aug 2013 19:36:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9F0DB8BB21A; Fri, 9 Aug 2013 19:36:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Fri, 09 Aug 2013 19:36:24 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/10] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0 Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e08d3e2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e08d3e2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e08d3e2a Branch: refs/heads/trunk Commit: e08d3e2adcf93c45e5e8e38ab12b11bea2b42a92 Parents: 8c94eb2 d62382b Author: Yuki Morishita Authored: Fri Aug 9 14:35:45 2013 -0500 Committer: Yuki Morishita Committed: Fri Aug 9 14:35:45 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionController.java | 2 +- .../cassandra/io/sstable/SSTableReader.java | 36 ++++++++++++++++++-- .../cassandra/metrics/ColumnFamilyMetrics.java | 21 ++++++++++++ .../apache/cassandra/service/CacheService.java | 2 +- 5 files changed, 58 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e08d3e2a/CHANGES.txt ----------------------------------------------------------------------