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 A571318E49 for ; Mon, 18 Jan 2016 10:28:28 +0000 (UTC) Received: (qmail 96739 invoked by uid 500); 18 Jan 2016 10:28:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96688 invoked by uid 500); 18 Jan 2016 10:28:27 -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 96374 invoked by uid 99); 18 Jan 2016 10:28:27 -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, 18 Jan 2016 10:28:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 658BFE0484; Mon, 18 Jan 2016 10:28:27 +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, 18 Jan 2016 10:28:35 -0000 Message-Id: <4d1978f214f1447094195c2cdf2ee95a@git.apache.org> In-Reply-To: <32a949900bf347a09db0402eaf1d582f@git.apache.org> References: <32a949900bf347a09db0402eaf1d582f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3 Merge branch 'cassandra-3.0' into cassandra-3.3 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6170ef8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6170ef8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6170ef8 Branch: refs/heads/trunk Commit: a6170ef80212f003895c964fd400674d9933cc6c Parents: b7356dd a3360af Author: Sylvain Lebresne Authored: Mon Jan 18 11:27:55 2016 +0100 Committer: Sylvain Lebresne Committed: Mon Jan 18 11:27:55 2016 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6170ef8/doc/cql3/CQL.textile ----------------------------------------------------------------------