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 EED9E200AC8 for ; Tue, 7 Jun 2016 19:56:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED908160A5B; Tue, 7 Jun 2016 17:56:06 +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 3DCE0160A5A for ; Tue, 7 Jun 2016 19:56:06 +0200 (CEST) Received: (qmail 47525 invoked by uid 500); 7 Jun 2016 17:56:05 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 47415 invoked by uid 99); 7 Jun 2016 17:56:05 -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; Tue, 07 Jun 2016 17:56:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1B6CCE1021; Tue, 7 Jun 2016 17:56:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dili@apache.org To: commits@ambari.apache.org Date: Tue, 07 Jun 2016 17:56:08 -0000 Message-Id: <378d855ef162433bb1037f6902e7591c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] ambari git commit: Ambari-16017: Update Moment.js to latest stable version 2.13.0 (Sangeeta Ravindran via dili) archived-at: Tue, 07 Jun 2016 17:56:07 -0000 Ambari-16017: Update Moment.js to latest stable version 2.13.0 (Sangeeta Ravindran via dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e2d4aff Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e2d4aff Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e2d4aff Branch: refs/heads/trunk Commit: 4e2d4aff33ff466581b8da79ef9ce7175cc8d53f Parents: 237715f Author: Di Li Authored: Tue Jun 7 13:54:57 2016 -0400 Committer: Di Li Committed: Tue Jun 7 13:54:57 2016 -0400 ---------------------------------------------------------------------- ambari-web/config.coffee | 2 +- ambari-web/karma.conf.js | 2 +- ambari-web/vendor/scripts/moment.js | 3195 ------- ambari-web/vendor/scripts/moment.min.js | 7 + .../slider/src/main/resources/ui/config.js | 4 +- .../ui/vendor/scripts/common/moment.js | 7768 ------------------ .../ui/vendor/scripts/common/moment.min.js | 7 + 7 files changed, 18 insertions(+), 10967 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2d4aff/ambari-web/config.coffee ---------------------------------------------------------------------- diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee index 6ed0915..4a29e73 100644 --- a/ambari-web/config.coffee +++ b/ambari-web/config.coffee @@ -61,7 +61,7 @@ exports.config = 'vendor/scripts/underscore.js', 'vendor/scripts/backbone.js', 'vendor/scripts/visualsearch.js', - 'vendor/scripts/moment.js', + 'vendor/scripts/moment.min.js', 'vendor/scripts/moment-timezone-with-data-2010-2020.js', 'vendor/scripts/workflow_visualization.js', 'vendor/scripts/rickshaw.js', http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2d4aff/ambari-web/karma.conf.js ---------------------------------------------------------------------- diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js index b11cf76..013cc2e 100644 --- a/ambari-web/karma.conf.js +++ b/ambari-web/karma.conf.js @@ -78,7 +78,7 @@ module.exports = function(config) { 'vendor/scripts/jquery.flexibleArea.js', 'vendor/scripts/FileSaver.js', 'vendor/scripts/Blob.js', - 'vendor/scripts/moment.js', + 'vendor/scripts/moment.min.js', 'vendor/scripts/moment-timezone-with-data-2010-2020.js', 'vendor/**/*.js', 'app/templates/**/*.hbs',