Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4728F200B35 for ; Tue, 5 Jul 2016 18:34:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 45D82160A60; Tue, 5 Jul 2016 16:34:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8E47D160A76 for ; Tue, 5 Jul 2016 18:34:54 +0200 (CEST) Received: (qmail 83452 invoked by uid 500); 5 Jul 2016 16:34:53 -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 83134 invoked by uid 99); 5 Jul 2016 16:34:53 -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, 05 Jul 2016 16:34:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 206AFE9E9C; Tue, 5 Jul 2016 16:34:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: carl@apache.org To: commits@cassandra.apache.org Date: Tue, 05 Jul 2016 16:34:57 -0000 Message-Id: In-Reply-To: <4b93c84a80eb418b9db383de0e839b69@git.apache.org> References: <4b93c84a80eb418b9db383de0e839b69@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk archived-at: Tue, 05 Jul 2016 16:34:55 -0000 Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49c954e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49c954e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49c954e7 Branch: refs/heads/trunk Commit: 49c954e7ae4fbb9461b2f1a9eaf285546b3b718f Parents: c57d0d4 237330a Author: Carl Yeksigian Authored: Tue Jul 5 12:25:34 2016 -0400 Committer: Carl Yeksigian Committed: Tue Jul 5 12:25:34 2016 -0400 ---------------------------------------------------------------------- .../cql3/statements/CreateViewStatement.java | 2 +- .../org/apache/cassandra/cql3/ViewTest.java | 31 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) ----------------------------------------------------------------------