You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/12/11 11:52:01 UTC
[4/5] 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/b55523e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b55523e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b55523e9
Branch: refs/heads/trunk
Commit: b55523e9750e60211ea69d90cdb54a66241ac75a
Parents: 37ca86b 7dd6b7d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 11 11:51:24 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 11 11:51:24 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/b55523e9/bin/cqlsh.py
----------------------------------------------------------------------