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 <[email protected]> Authored: Tue Jun 12 15:05:43 2012 +0200 Committer: Sylvain Lebresne <[email protected]> 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 ----------------------------------------------------------------------
