You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/10/16 11:58:35 UTC
[3/3] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3143e62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3143e62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3143e62
Branch: refs/heads/cassandra-3.0
Commit: f3143e624cb73e86ea11dd2f9994c70008fc26aa
Parents: a52597d 94a7d06
Author: blerer <be...@datastax.com>
Authored: Fri Oct 16 11:56:46 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Fri Oct 16 11:57:22 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3143e62/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------