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 6F9E9128C1 for ; Sun, 11 May 2014 00:36:31 +0000 (UTC) Received: (qmail 13661 invoked by uid 500); 10 May 2014 21:58:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 74077 invoked by uid 500); 10 May 2014 21:56:54 -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 61014 invoked by uid 99); 10 May 2014 21:56:19 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7461B941BFB; Thu, 8 May 2014 21:00:18 +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: Thu, 08 May 2014 21:00:19 -0000 Message-Id: <3963906cff9540f789b0b480bc6d3039@git.apache.org> In-Reply-To: <789527c1801f4b0f928e3819964b7b09@git.apache.org> References: <789527c1801f4b0f928e3819964b7b09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a89fd4d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a89fd4d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a89fd4d1 Branch: refs/heads/trunk Commit: a89fd4d1d6387e284d7f12da9102322aee4c31d6 Parents: 355e69b 46f7f84 Author: Tyler Hobbs Authored: Thu May 8 15:59:03 2014 -0500 Committer: Tyler Hobbs Committed: Thu May 8 15:59:03 2014 -0500 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89fd4d1/doc/cql3/CQL.textile ----------------------------------------------------------------------