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 C055A18E05 for ; Mon, 1 Jun 2015 18:02:34 +0000 (UTC) Received: (qmail 42515 invoked by uid 500); 1 Jun 2015 18:02:34 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 42414 invoked by uid 500); 1 Jun 2015 18:02:34 -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 42238 invoked by uid 99); 1 Jun 2015 18:02:34 -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; Mon, 01 Jun 2015 18:02:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C4ABE0505; Mon, 1 Jun 2015 18:02:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joyce@apache.org To: commits@climate.apache.org Date: Mon, 01 Jun 2015 18:02:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] climate git commit: Resolve CLIMATE-637. Merge PR #201. Resolve CLIMATE-637. Merge PR #201. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8c6bf054 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8c6bf054 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8c6bf054 Branch: refs/heads/master Commit: 8c6bf05423688ede48f4d48f03eef41d73df3db7 Parents: f87a875 f4849f2 Author: Michael Joyce Authored: Mon Jun 1 10:59:58 2015 -0700 Committer: Michael Joyce Committed: Mon Jun 1 10:59:58 2015 -0700 ---------------------------------------------------------------------- ocw/evaluation.py | 42 ++++++++++++--- ocw/tests/test_evaluation.py | 107 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 6 deletions(-) ----------------------------------------------------------------------