Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-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 ACE7510392 for ; Tue, 23 Jul 2013 20:22:24 +0000 (UTC) Received: (qmail 65649 invoked by uid 500); 23 Jul 2013 20:22:24 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 65621 invoked by uid 500); 23 Jul 2013 20:22:24 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 65606 invoked by uid 99); 23 Jul 2013 20:22:24 -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, 23 Jul 2013 20:22:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5EBFF8B26A3; Tue, 23 Jul 2013 20:22:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tbeerbower@apache.org To: ambari-commits@incubator.apache.org Date: Tue, 23 Jul 2013 20:22:26 -0000 Message-Id: In-Reply-To: <1bb91a64fc7f44958644a2bd3807e41d@git.apache.org> References: <1bb91a64fc7f44958644a2bd3807e41d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/incubator-ambari into trunk Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/incubator-ambari into trunk Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/aa31e2cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/aa31e2cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/aa31e2cc Branch: refs/heads/trunk Commit: aa31e2ccb5bd6ef63b01a3fc7acc561dd4a430a5 Parents: 6e2fa03 0368796 Author: tbeerbower Authored: Tue Jul 23 16:20:23 2013 -0400 Committer: tbeerbower Committed: Tue Jul 23 16:20:23 2013 -0400 ---------------------------------------------------------------------- ambari-web/app/views/common/chart/linear_time.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ----------------------------------------------------------------------