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 EB0B41033B for ; Thu, 5 Mar 2015 18:55:09 +0000 (UTC) Received: (qmail 4706 invoked by uid 500); 5 Mar 2015 18:55:09 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 4584 invoked by uid 500); 5 Mar 2015 18:55:09 -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 4361 invoked by uid 99); 5 Mar 2015 18:55:09 -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; Thu, 05 Mar 2015 18:55:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F18FE0844; Thu, 5 Mar 2015 18:55:09 +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, 05 Mar 2015 18:55:11 -0000 Message-Id: <24f162f34dff41b6bd943dbf3adeaa08@git.apache.org> In-Reply-To: <7f1c675451694566b38293d2cbbf7d3b@git.apache.org> References: <7f1c675451694566b38293d2cbbf7d3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56e190b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e190b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e190b1 Branch: refs/heads/trunk Commit: 56e190b1cd18ea04dd9835722b599f75f80f30a7 Parents: 71778ee 59ed491 Author: Tyler Hobbs Authored: Thu Mar 5 12:54:58 2015 -0600 Committer: Tyler Hobbs Committed: Thu Mar 5 12:54:58 2015 -0600 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e190b1/doc/cql3/CQL.textile ----------------------------------------------------------------------