Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78F5018351 for ; Thu, 3 Sep 2015 21:30:35 +0000 (UTC) Received: (qmail 24266 invoked by uid 500); 3 Sep 2015 21:30:35 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 24184 invoked by uid 500); 3 Sep 2015 21:30:35 -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 24168 invoked by uid 99); 3 Sep 2015 21:30:35 -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, 03 Sep 2015 21:30:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 362B0E7EB6; Thu, 3 Sep 2015 21:30:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: boustani@apache.org To: commits@climate.apache.org Date: Thu, 03 Sep 2015 21:30:36 -0000 Message-Id: <64673b2cedb24ae0ab66bd88f5dec636@git.apache.org> In-Reply-To: <1a83abbb66cb482bb5ae007acd51fb75@git.apache.org> References: <1a83abbb66cb482bb5ae007acd51fb75@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] climate git commit: Merge branch 'CLIMATE-661' Merge branch 'CLIMATE-661' Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/a63049bf Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/a63049bf Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/a63049bf Branch: refs/heads/master Commit: a63049bfb884723bdea3925bb50fd14988c29f53 Parents: 29f6655 21faafd Author: Maziyar Boustani Authored: Thu Sep 3 14:30:20 2015 -0700 Committer: Maziyar Boustani Committed: Thu Sep 3 14:30:20 2015 -0700 ---------------------------------------------------------------------- ocw-cli/cli_app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------