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 781C7200CAE for ; Wed, 21 Jun 2017 20:53:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 765A5160BD5; Wed, 21 Jun 2017 18:53:10 +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 B2308160BD0 for ; Wed, 21 Jun 2017 20:53:09 +0200 (CEST) Received: (qmail 14706 invoked by uid 500); 21 Jun 2017 18:53:08 -0000 Mailing-List: contact commits-help@climate.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.apache.org Delivered-To: mailing list commits@climate.apache.org Received: (qmail 14687 invoked by uid 99); 21 Jun 2017 18:53:08 -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; Wed, 21 Jun 2017 18:53:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE96AE049A; Wed, 21 Jun 2017 18:53:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: huikyole@apache.org To: commits@climate.apache.org Date: Wed, 21 Jun 2017 18:53:09 -0000 Message-Id: <23ed952ae9594a0f8594c2835676b368@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] climate git commit: Merge branch 'CLIMATE-918' archived-at: Wed, 21 Jun 2017 18:53:10 -0000 Merge branch 'CLIMATE-918' Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ec3fdb4f Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ec3fdb4f Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ec3fdb4f Branch: refs/heads/master Commit: ec3fdb4f70e31635575bb519d2b0fbe642c10c9a Parents: cb93fce e563016 Author: huikyole Authored: Wed Jun 21 11:52:53 2017 -0700 Committer: huikyole Committed: Wed Jun 21 11:52:53 2017 -0700 ---------------------------------------------------------------------- ocw/data_source/local.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------