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 14761E13F for ; Thu, 17 Jan 2013 05:37:36 +0000 (UTC) Received: (qmail 3512 invoked by uid 500); 17 Jan 2013 05:37:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3150 invoked by uid 500); 17 Jan 2013 05:37:35 -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 3117 invoked by uid 99); 17 Jan 2013 05:37:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 05:37:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B2E9E1FBFA; Thu, 17 Jan 2013 05:37:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130117053734.B2E9E1FBFA@tyr.zones.apache.org> Date: Thu, 17 Jan 2013 05:37:34 +0000 (UTC) Updated Branches: refs/heads/trunk 0474c3a33 -> 2efeaf3ec Merge branch 'cassandra-1.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/2efeaf3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2efeaf3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2efeaf3e Branch: refs/heads/trunk Commit: 2efeaf3ecde1a748aa08e816352cd803d154fe05 Parents: 0474c3a 205a993 Author: Dave Brosius Authored: Thu Jan 17 00:35:09 2013 -0500 Committer: Dave Brosius Committed: Thu Jan 17 00:35:09 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 5 ++++ .../cassandra/db/ColumnFamilyStoreMBean.java | 6 +++++ src/java/org/apache/cassandra/db/DataTracker.java | 18 +++++++++++++++ .../cassandra/io/sstable/SSTableMetadata.java | 12 +++++++++- .../apache/cassandra/io/sstable/SSTableReader.java | 5 ++++ 6 files changed, 47 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/src/java/org/apache/cassandra/db/DataTracker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2efeaf3e/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------