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 557E310EC7 for ; Mon, 19 Aug 2013 23:04:39 +0000 (UTC) Received: (qmail 55636 invoked by uid 500); 19 Aug 2013 23:04:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55578 invoked by uid 500); 19 Aug 2013 23:04:37 -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 55441 invoked by uid 99); 19 Aug 2013 23:04:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Aug 2013 23:04:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C4168C035C; Mon, 19 Aug 2013 23:04:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Mon, 19 Aug 2013 23:04:46 -0000 Message-Id: <2fa14a79621a4822bdca5b978d30d7d0@git.apache.org> In-Reply-To: <64dffdc8bd264b14ac0cd82154338713@git.apache.org> References: <64dffdc8bd264b14ac0cd82154338713@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88a39006 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88a39006 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88a39006 Branch: refs/heads/trunk Commit: 88a390064425171c617b66280a0a5961b234599b Parents: 883ed60 83feb94 Author: Jonathan Ellis Authored: Mon Aug 19 18:04:31 2013 -0500 Committer: Jonathan Ellis Committed: Mon Aug 19 18:04:31 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 ++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88a39006/CHANGES.txt ----------------------------------------------------------------------