Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfadbb8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfadbb8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfadbb8b Branch: refs/heads/trunk Commit: cfadbb8b5fc9d7891cf57ae1ebe37936a4e7c24f Parents: e472ba4 703bd68 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Aug 12 12:57:00 2013 +0200 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Aug 12 12:57:00 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 43 ++- pylib/cqlshlib/cql3handling.py | 281 ++++--------------- pylib/cqlshlib/test/test_cqlsh_output.py | 5 +- .../cql3/statements/CreateIndexStatement.java | 2 +- .../cql3/statements/SelectStatement.java | 116 ++++---- .../CompositesIndexOnClusteringKey.java | 5 +- 7 files changed, 135 insertions(+), 318 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfadbb8b/CHANGES.txt ----------------------------------------------------------------------
