Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee36f14c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee36f14c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee36f14c Branch: refs/heads/cassandra-3.0 Commit: ee36f14c1427db8e3b91b7eda6c0e6f48ecb4f24 Parents: ae8baa4 3ccffc9 Author: Joshua McKenzie <[email protected]> Authored: Wed Dec 23 13:21:12 2015 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Wed Dec 23 13:21:12 2015 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/copyutil.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee36f14c/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
