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 0A0B5117B2 for ; Wed, 4 Jun 2014 15:03:06 +0000 (UTC) Received: (qmail 73422 invoked by uid 500); 4 Jun 2014 15:03:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73376 invoked by uid 500); 4 Jun 2014 15:03:05 -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 73361 invoked by uid 99); 4 Jun 2014 15:03:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 15:03:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9BEEF892B5E; Wed, 4 Jun 2014 15:03:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 04 Jun 2014 15:03:07 -0000 Message-Id: <7fdfb9f4fa39471b948510beadc60fab@git.apache.org> In-Reply-To: <2832d4f58b3746d1841b0705e413a979@git.apache.org> References: <2832d4f58b3746d1841b0705e413a979@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk 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/f81d5ddc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f81d5ddc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f81d5ddc Branch: refs/heads/trunk Commit: f81d5ddc630c8fe5b4e412412d3ec0f1fa3bb923 Parents: 1def02f 2d76d9f Author: Aleksey Yeschenko Authored: Wed Jun 4 18:02:47 2014 +0300 Committer: Aleksey Yeschenko Committed: Wed Jun 4 18:02:47 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++++ src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 4 ++++ 3 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f81d5ddc/CHANGES.txt ----------------------------------------------------------------------