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 66E15200B7A for ; Fri, 29 Jul 2016 19:19:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 65B50160A79; Fri, 29 Jul 2016 17:19:33 +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 65416160AB3 for ; Fri, 29 Jul 2016 19:19:32 +0200 (CEST) Received: (qmail 20594 invoked by uid 500); 29 Jul 2016 17:19:31 -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 20209 invoked by uid 99); 29 Jul 2016 17:19:31 -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; Fri, 29 Jul 2016 17:19:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A4ABE5725; Fri, 29 Jul 2016 17:19:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: goodman@apache.org To: commits@climate.apache.org Date: Fri, 29 Jul 2016 17:19:45 -0000 Message-Id: <56b094a0aafc40438dd6125764a1cd79@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/18] climate git commit: Merge branch 'CLIMATE-832' archived-at: Fri, 29 Jul 2016 17:19:33 -0000 Merge branch 'CLIMATE-832' Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/4dee551f Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/4dee551f Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/4dee551f Branch: refs/heads/CLIMATE-825 Commit: 4dee551fa79a2738b11745fa1db141b8bb27088a Parents: 1398a86 b5f9358 Author: Ibrahim Jarif Authored: Thu Jul 28 19:46:56 2016 +0530 Committer: Ibrahim Jarif Committed: Thu Jul 28 19:46:56 2016 +0530 ---------------------------------------------------------------------- easy-ocw/ocw-conda-dependencies.txt | 12 +-- easy-ocw/ocw-pip-dependencies.txt | 22 ++--- test.sh | 27 ++++++ test_smoke.py | 139 +++++++++++++++++++++++++++++++ 4 files changed, 183 insertions(+), 17 deletions(-) ----------------------------------------------------------------------