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 054F5104F5 for ; Fri, 25 Oct 2013 14:56:45 +0000 (UTC) Received: (qmail 93213 invoked by uid 500); 25 Oct 2013 14:56:44 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 93137 invoked by uid 500); 25 Oct 2013 14:56:44 -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 92625 invoked by uid 99); 25 Oct 2013 14:56:43 -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, 25 Oct 2013 14:56:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2632F81DCA9; Fri, 25 Oct 2013 14:56:43 +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: Fri, 25 Oct 2013 14:56:48 -0000 Message-Id: <6c767ec28a0d4ac5b1923bfa507b3ac5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/8d1bb075 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d1bb075 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d1bb075 Branch: refs/heads/trunk Commit: 8d1bb07530390128c1ec5d48daf438380a7cce8e Parents: 2faac19 9385cfd Author: Jonathan Ellis Authored: Fri Oct 25 09:47:21 2013 -0500 Committer: Jonathan Ellis Committed: Fri Oct 25 09:47:21 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------