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 6A18E18B5E for ; Mon, 26 Oct 2015 12:34:51 +0000 (UTC) Received: (qmail 1883 invoked by uid 500); 26 Oct 2015 12:34:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 1778 invoked by uid 500); 26 Oct 2015 12:34:51 -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 1593 invoked by uid 99); 26 Oct 2015 12:34:51 -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; Mon, 26 Oct 2015 12:34:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D90E3E0280; Mon, 26 Oct 2015 12:34:50 +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 Date: Mon, 26 Oct 2015 12:34:52 -0000 Message-Id: In-Reply-To: <52487c80e1bd46deb22d878f716c7b0e@git.apache.org> References: <52487c80e1bd46deb22d878f716c7b0e@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/f91aad46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f91aad46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f91aad46 Branch: refs/heads/trunk Commit: f91aad4655306aff030bbcde93e6baed196a776d Parents: 4f62eb9 25e0625 Author: Sylvain Lebresne Authored: Mon Oct 26 13:34:42 2015 +0100 Committer: Sylvain Lebresne Committed: Mon Oct 26 13:34:42 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ReadCommand.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f91aad46/src/java/org/apache/cassandra/db/ReadCommand.java ----------------------------------------------------------------------