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 871EE10BE6 for ; Mon, 25 Nov 2013 23:31:59 +0000 (UTC) Received: (qmail 24304 invoked by uid 500); 25 Nov 2013 23:31:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 24246 invoked by uid 500); 25 Nov 2013 23:31:59 -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 24108 invoked by uid 99); 25 Nov 2013 23:31:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Nov 2013 23:31:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E0C8691061E; Mon, 25 Nov 2013 23:31:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 25 Nov 2013 23:32:00 -0000 Message-Id: <36f44de8c5c54ba9b1d80e2f4ac3d4d3@git.apache.org> In-Reply-To: <8e18a05ca5f84ce8b7bd51ac45176e6c@git.apache.org> References: <8e18a05ca5f84ce8b7bd51ac45176e6c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a1b4322 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a1b4322 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a1b4322 Branch: refs/heads/trunk Commit: 4a1b4322d8bfc4f7a8d2668a4326bac86c49a01d Parents: f69e043 6c68b30 Author: Aleksey Yeschenko Authored: Tue Nov 26 02:30:18 2013 +0300 Committer: Aleksey Yeschenko Committed: Tue Nov 26 02:30:18 2013 +0300 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------