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 8B007200CDD for ; Mon, 7 Aug 2017 17:07:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 87FAC1657EA; Mon, 7 Aug 2017 15:07:04 +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 077D21657E9 for ; Mon, 7 Aug 2017 17:07:03 +0200 (CEST) Received: (qmail 48279 invoked by uid 500); 7 Aug 2017 15:07:03 -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 48131 invoked by uid 99); 7 Aug 2017 15:07:03 -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, 07 Aug 2017 15:07:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84F1FF32B1; Mon, 7 Aug 2017 15:07:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Mon, 07 Aug 2017 15:07:07 -0000 Message-Id: <02234106d3014151b546d3ddacbf4ead@git.apache.org> In-Reply-To: <0e6a72c3fdf1465d92d809a87481413e@git.apache.org> References: <0e6a72c3fdf1465d92d809a87481413e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] ambari git commit: Merge branch 'branch-2.5' into branch-2.6 archived-at: Mon, 07 Aug 2017 15:07:04 -0000 Merge branch 'branch-2.5' into branch-2.6 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9d087c4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9d087c4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9d087c4 Branch: refs/heads/branch-2.6 Commit: d9d087c4140a0c68f7c60e1ff025977ccbe541d8 Parents: 7efb9de f5e9d17 Author: Jonathan Hurley Authored: Mon Aug 7 11:06:44 2017 -0400 Committer: Jonathan Hurley Committed: Mon Aug 7 11:06:44 2017 -0400 ---------------------------------------------------------------------- .../configuration/ams-logsearch-conf.xml | 201 +++++++++++++++++++ .../HDP/2.6/services/SPARK2/kerberos.json | 2 +- .../main/host/bulk_operations_controller.js | 2 +- ambari-web/app/controllers/main/host/details.js | 69 +++++++ ambari-web/app/utils/helper.js | 11 +- ambari-web/test/utils/helper_test.js | 5 + 6 files changed, 285 insertions(+), 5 deletions(-) ----------------------------------------------------------------------