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/382d9a94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/382d9a94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/382d9a94 Branch: refs/heads/cassandra-3.0 Commit: 382d9a943bdf33e528fa6509e3bd12c2bc9ecc70 Parents: 8bc567b ee36f14 Author: Joshua McKenzie <[email protected]> Authored: Wed Dec 23 13:21:19 2015 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Wed Dec 23 13:21:19 2015 -0500 ---------------------------------------------------------------------- pylib/cqlshlib/copyutil.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
