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/ce6ad5bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce6ad5bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce6ad5bf Branch: refs/heads/trunk Commit: ce6ad5bf835aab747a1dfc6165e7033a3ea04e6e Parents: 3c8d87f 382d9a9 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Wed Dec 23 13:21:27 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Wed Dec 23 13:21:27 2015 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/copyutil.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce6ad5bf/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
