Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dba90801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dba90801 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dba90801 Branch: refs/heads/trunk Commit: dba9080178fdf31c1193510395663a5213b64873 Parents: 7c0d161 574ca2e Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Nov 11 11:02:06 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Nov 11 11:02:06 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dba90801/CHANGES.txt ----------------------------------------------------------------------
