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 F1066109C2 for ; Tue, 27 May 2014 21:19:21 +0000 (UTC) Received: (qmail 46631 invoked by uid 500); 27 May 2014 21:19:21 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 46590 invoked by uid 500); 27 May 2014 21:19:21 -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 46550 invoked by uid 99); 27 May 2014 21:19:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 21:19:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A62CC32ADBD; Tue, 27 May 2014 21:19:21 +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: Tue, 27 May 2014 21:19:22 -0000 Message-Id: <36fe9236bf714a86837fa6c8e29ef88f@git.apache.org> In-Reply-To: <853b0628a4e34e84a2ebea88be525ac1@git.apache.org> References: <853b0628a4e34e84a2ebea88be525ac1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'CLIMATE-438', Merge PR #44, Resolve 'CLIMATE-439'. Merge branch 'CLIMATE-438', Merge PR #44, Resolve 'CLIMATE-439'. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f38d82dd Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f38d82dd Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f38d82dd Branch: refs/heads/master Commit: f38d82ddc6a9637094872d67423901cf4de073a9 Parents: 278b35f 74e400c Author: Maziyar Boustani Authored: Tue May 27 14:18:20 2014 -0700 Committer: Maziyar Boustani Committed: Tue May 27 14:18:20 2014 -0700 ---------------------------------------------------------------------- ocw/tests/test_utils.py | 29 +++++++++++++++++++++++++++-- ocw/utils.py | 27 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) ----------------------------------------------------------------------