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/58643b0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58643b0a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58643b0a Branch: refs/heads/cassandra-3.0 Commit: 58643b0afe1521e1d99be1fc4532deb9b902d767 Parents: a3ae9d8 e253bfe Author: Aleksey Yeschenko <[email protected]> Authored: Thu Jan 14 17:12:24 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Jan 14 17:12:24 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58643b0a/CHANGES.txt ----------------------------------------------------------------------
