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 7E47C1836D for ; Wed, 12 Aug 2015 09:26:45 +0000 (UTC) Received: (qmail 57179 invoked by uid 500); 12 Aug 2015 09:26:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 57133 invoked by uid 500); 12 Aug 2015 09:26:42 -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 57113 invoked by uid 99); 12 Aug 2015 09:26:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Aug 2015 09:26:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11D6BE05D6; Wed, 12 Aug 2015 09:26:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Wed, 12 Aug 2015 09:26:43 -0000 Message-Id: <7d0f1a96f11a48c6a8babd4cf3fae107@git.apache.org> In-Reply-To: <9974c48e2dad4dd1890e1c48e1c23031@git.apache.org> References: <9974c48e2dad4dd1890e1c48e1c23031@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.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/ad6f85e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad6f85e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad6f85e7 Branch: refs/heads/trunk Commit: ad6f85e7b691e0dbf593edac1df5f3a0bd919b5c Parents: 22bfdab 4623aa6 Author: Benedict Elliott Smith Authored: Wed Aug 12 11:25:15 2015 +0200 Committer: Benedict Elliott Smith Committed: Wed Aug 12 11:25:15 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ReadResponse.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------