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 BB1B018F8A for ; Tue, 23 Feb 2016 17:30:06 +0000 (UTC) Received: (qmail 5682 invoked by uid 500); 23 Feb 2016 17:30:03 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 5597 invoked by uid 500); 23 Feb 2016 17:30:03 -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 5379 invoked by uid 99); 23 Feb 2016 17:30:03 -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; Tue, 23 Feb 2016 17:30:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52C9EE8E75; Tue, 23 Feb 2016 17:30:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Tue, 23 Feb 2016 17:30:05 -0000 Message-Id: In-Reply-To: <4375873d21bf45a798c10765683b9216@git.apache.org> References: <4375873d21bf45a798c10765683b9216@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/babf30dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/babf30dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/babf30dd Branch: refs/heads/trunk Commit: babf30dd13dfdd49398d4067edff874f64051ad2 Parents: fc9c6fa e9abaab Author: Tyler Hobbs Authored: Tue Feb 23 11:29:13 2016 -0600 Committer: Tyler Hobbs Committed: Tue Feb 23 11:29:13 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../transport/messages/ErrorMessage.java | 6 ++++-- .../cassandra/transport/ProtocolErrorTest.java | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/babf30dd/CHANGES.txt ----------------------------------------------------------------------