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/105ccb3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/105ccb3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/105ccb3d

Branch: refs/heads/trunk
Commit: 105ccb3d20492031ac04a8e435d0325b47b39ed1
Parents: 4d6fdaa b55523e
Author: Sylvain Lebresne <[email protected]>
Authored: Fri Dec 11 11:51:49 2015 +0100
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri Dec 11 11:51:49 2015 +0100

----------------------------------------------------------------------
 bin/cqlsh.py                       |  14 +-
 pylib/cqlshlib/copy.py             | 647 --------------------------------
 pylib/cqlshlib/copyutil.py         | 646 +++++++++++++++++++++++++++++++
 pylib/cqlshlib/test/basecase.py    |  16 +-
 pylib/cqlshlib/test/cassconnect.py |   6 +-
 5 files changed, 659 insertions(+), 670 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/105ccb3d/bin/cqlsh.py
----------------------------------------------------------------------

Reply via email to