From commits-return-2746-archive-asf-public=cust-asf.ponee.io@climate.apache.org Wed Jan 17 03:01:57 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id CB2BC18066D for ; Wed, 17 Jan 2018 03:01:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BB645160C46; Wed, 17 Jan 2018 02:01:57 +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 0DBED160C34 for ; Wed, 17 Jan 2018 03:01:56 +0100 (CET) Received: (qmail 86292 invoked by uid 500); 17 Jan 2018 02:01:56 -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 86274 invoked by uid 99); 17 Jan 2018 02:01:56 -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, 17 Jan 2018 02:01:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F726F170C; Wed, 17 Jan 2018 02:01:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lewismc@apache.org To: commits@climate.apache.org Date: Wed, 17 Jan 2018 02:01:57 -0000 Message-Id: <5f0627652eaa4f91bd9acb98bb4f3e84@git.apache.org> In-Reply-To: <3e53e165bf0d47aaa6185a1830c667a2@git.apache.org> References: <3e53e165bf0d47aaa6185a1830c667a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] climate git commit: Merge branch 'CLIMATE-413' of https://github.com/MichaelArthurAnderson/climate Merge branch 'CLIMATE-413' of https://github.com/MichaelArthurAnderson/climate Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/59dbe805 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/59dbe805 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/59dbe805 Branch: refs/heads/master Commit: 59dbe805b9dfd148eab29deadb292d652894f9f1 Parents: 69bbe27 5a632c8 Author: Lewis John McGibbney Authored: Tue Jan 16 18:01:49 2018 -0800 Committer: Lewis John McGibbney Committed: Tue Jan 16 18:01:49 2018 -0800 ---------------------------------------------------------------------- ocw-ui/frontend/package.json | 22 +++++++++++------ ocw-ui/frontend/test/karma.conf.js | 43 ++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 14 deletions(-) ----------------------------------------------------------------------