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 3CC7211168 for ; Fri, 22 Aug 2014 18:58:02 +0000 (UTC) Received: (qmail 15665 invoked by uid 500); 22 Aug 2014 18:58:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 15636 invoked by uid 500); 22 Aug 2014 18:58:02 -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 15574 invoked by uid 99); 22 Aug 2014 18:58:02 -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, 22 Aug 2014 18:58:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A73EF9C8738; Fri, 22 Aug 2014 18:58:01 +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: Fri, 22 Aug 2014 18:58:02 -0000 Message-Id: <097bc6cfdd2a49a282ffdd7b54bc740d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6434ad8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6434ad8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6434ad8b Branch: refs/heads/trunk Commit: 6434ad8bc901127b67d4b7efd95a36175326aa96 Parents: 94f1107 a5617d6 Author: Aleksey Yeschenko Authored: Fri Aug 22 21:55:31 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Aug 22 21:55:31 2014 +0300 ---------------------------------------------------------------------- .../LimitedLocalNodeFirstLocalBalancingPolicy.java | 17 +++++++++++++++++ .../io/compress/CompressedRandomAccessReader.java | 2 +- .../io/compress/CorruptBlockException.java | 14 ++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) ----------------------------------------------------------------------