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 0BC78190A5 for ; Tue, 29 Mar 2016 12:02:18 +0000 (UTC) Received: (qmail 25778 invoked by uid 500); 29 Mar 2016 12:02:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 25698 invoked by uid 500); 29 Mar 2016 12:02:15 -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 25238 invoked by uid 99); 29 Mar 2016 12:02:15 -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, 29 Mar 2016 12:02:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5351BDFF10; Tue, 29 Mar 2016 12:02:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Tue, 29 Mar 2016 12:02:29 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/20] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1de53427 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1de53427 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1de53427 Branch: refs/heads/cassandra-3.0 Commit: 1de534276696a0731721a4bace5e10b416e52425 Parents: 9806a11 fc972b9 Author: Sam Tunnicliffe Authored: Tue Mar 29 12:57:26 2016 +0100 Committer: Sam Tunnicliffe Committed: Tue Mar 29 12:57:26 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/validation/entities/JsonTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de53427/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java ----------------------------------------------------------------------