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 00FFA9528 for ; Tue, 12 Jun 2012 13:05:52 +0000 (UTC) Received: (qmail 54064 invoked by uid 500); 12 Jun 2012 13:05:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 54036 invoked by uid 500); 12 Jun 2012 13:05:51 -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 54024 invoked by uid 99); 12 Jun 2012 13:05:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 13:05:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 83D955979; Tue, 12 Jun 2012 13:05:51 +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 X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120612130551.83D955979@tyr.zones.apache.org> Date: Tue, 12 Jun 2012 13:05:51 +0000 (UTC) Updated Branches: refs/heads/trunk 678f6ae38 -> 682a34f36 Merge branch 'cassandra-1.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/682a34f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/682a34f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/682a34f3 Branch: refs/heads/trunk Commit: 682a34f36325769bc06b5d3fee85f23e2766cfaf Parents: 678f6ae 26a087c Author: Sylvain Lebresne Authored: Tue Jun 12 15:05:43 2012 +0200 Committer: Sylvain Lebresne Committed: Tue Jun 12 15:05:43 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 + build.xml | 27 +- conf/cassandra-env.sh | 10 +- doc/cql3/CQL.css | 103 ++ doc/cql3/CQL.textile | 826 +++++++++++++++ .../cql3/statements/CreateIndexStatement.java | 6 +- 6 files changed, 961 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/682a34f3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/682a34f3/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/682a34f3/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ----------------------------------------------------------------------