Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 12BF2200B91 for ; Thu, 25 Aug 2016 03:12:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 11AFC160AB1; Thu, 25 Aug 2016 01:12:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6DD8F160AC7 for ; Thu, 25 Aug 2016 03:12:15 +0200 (CEST) Received: (qmail 29971 invoked by uid 500); 25 Aug 2016 01:12:14 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 29549 invoked by uid 99); 25 Aug 2016 01:12:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Aug 2016 01:12:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D92EE0C09; Thu, 25 Aug 2016 01:12:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Thu, 25 Aug 2016 01:12:18 -0000 Message-Id: In-Reply-To: <7926729b624841d6b2dcdb31425510a3@git.apache.org> References: <7926729b624841d6b2dcdb31425510a3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk archived-at: Thu, 25 Aug 2016 01:12:16 -0000 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/03659d7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03659d7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03659d7b Branch: refs/heads/trunk Commit: 03659d7b944701964e6f6657830ca96e4f47149e Parents: fdfc2d8 431ecdb Author: Stefania Alborghetti Authored: Thu Aug 25 09:11:01 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Aug 25 09:11:01 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03659d7b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03659d7b/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------