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 C13CE9948 for ; Wed, 22 Feb 2012 13:24:10 +0000 (UTC) Received: (qmail 66392 invoked by uid 500); 22 Feb 2012 13:24:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 66367 invoked by uid 500); 22 Feb 2012 13:24:10 -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 66359 invoked by uid 99); 22 Feb 2012 13:24:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 13:24:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 13:24:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EC2AF8122B1; Wed, 22 Feb 2012 13:23:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1 Message-Id: <20120222132343.EC2AF8122B1@tyr.zones.apache.org> Date: Wed, 22 Feb 2012 13:23:43 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68268954 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68268954 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68268954 Branch: refs/heads/cassandra-1.1 Commit: 68268954ac7ebe825cf61f28c8ccbd95dd0fed75 Parents: 87b786f 8413d83 Author: Sylvain Lebresne Authored: Wed Feb 22 14:23:06 2012 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 22 14:23:06 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/RetriedSliceFromReadCommand.java | 2 +- .../apache/cassandra/db/SliceFromReadCommand.java | 25 ++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68268954/CHANGES.txt ----------------------------------------------------------------------