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-feature-AMBARI-21450
Commit: d9d087c4140a0c68f7c60e1ff025977ccbe541d8
Parents: 7efb9de f5e9d17
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Mon Aug 7 11:06:44 2017 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
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(-)
----------------------------------------------------------------------


Reply via email to