Merge branch cassandra-3.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/6ef817a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ef817a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ef817a5 Branch: refs/heads/trunk Commit: 6ef817a51d0425ae51b5ab16a17ce7a92304fd0d Parents: 1cb9a02 f3143e6 Author: blerer <benjamin.le...@datastax.com> Authored: Fri Oct 16 12:01:18 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Fri Oct 16 12:01:29 2015 +0200 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 8 +- pylib/cqlshlib/cqlhandling.py | 10 ++ pylib/cqlshlib/test/run_cqlsh.py | 2 +- pylib/cqlshlib/test/test_cql_parsing.py | 240 +++++++++++++-------------- 4 files changed, 137 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
