Merge branch 'trunk' into branch-feature-AMBARI-18634

Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c9aabc3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c9aabc3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c9aabc3

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 4c9aabc303232e50fddd7d47b6dfd0769f8a68ea
Parents: 5fc8a0e 2a0c941
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Wed Nov 9 16:49:22 2016 -0500
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Wed Nov 9 16:49:22 2016 -0500

----------------------------------------------------------------------
 ambari-server/docs/configuration/index.md       |   2 +
 .../server/configuration/Configuration.java     |  30 +-
 .../AmbariLdapBindAuthenticator.java            |  15 +-
 .../authorization/LdapServerProperties.java     |  26 ++
 .../kerberos/MITKerberosOperationHandler.java   |  28 +-
 .../2.0.0/package/scripts/hawq_constants.py     |   2 +-
 .../HAWQ/2.0.0/package/scripts/params.py        |   6 +
 .../HAWQ/2.0.0/package/scripts/service_check.py |   1 +
 .../package/scripts/webhcat_service.py          |   7 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    | 119 ++++++--
 .../stacks/HDP/2.5/services/stack_advisor.py    |  15 +-
 .../AmbariLdapBindAuthenticatorTest.java        |  17 +-
 .../MITKerberosOperationHandlerTest.java        |  57 ++--
 .../common-services/HAWQ/test_hawqmaster.py     |   4 +
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |  28 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |  29 ++
 .../stacks/2.3/common/test_stack_advisor.py     |  28 ++
 .../stacks/2.5/common/test_stack_advisor.py     |   9 +-
 ambari-web/app/config.js                        |   1 +
 ambari-web/app/data/custom_stack_map.js         |   2 +-
 .../main/host/details/actions/check_host.js     |  21 +-
 ambari-web/app/styles/application.less          | 206 +++++---------
 ambari-web/app/styles/common.less               |  18 ++
 .../main/host/details/host_component.hbs        |  61 +++--
 ambari-web/app/templates/main/host/metrics.hbs  |  52 ++--
 ambari-web/app/templates/main/host/summary.hbs  |  37 +--
 .../app/templates/main/service/info/summary.hbs |  16 +-
 .../main/service/info/summary/base.hbs          |   8 +-
 .../service/info/summary/client_components.hbs  |  14 +-
 .../service/info/summary/master_components.hbs  |  25 +-
 .../service/info/summary/slave_components.hbs   |  22 +-
 .../app/templates/main/service/service.hbs      |  11 +-
 .../templates/main/service/services/flume.hbs   | 222 +++++++--------
 .../templates/main/service/services/hbase.hbs   | 142 +++++-----
 .../templates/main/service/services/hdfs.hbs    | 274 +++++++++----------
 .../templates/main/service/services/hive.hbs    |  54 ++--
 .../templates/main/service/services/ranger.hbs  |  60 ++--
 .../templates/main/service/services/storm.hbs   | 117 ++++----
 .../templates/main/service/services/yarn.hbs    | 146 +++++-----
 ambari-web/app/templates/wizard/step3.hbs       |  18 +-
 ambari-web/app/utils/config.js                  |   8 +-
 .../app/views/main/service/info/summary.js      |  58 ++--
 ambari-web/app/views/main/service/service.js    |  14 +-
 .../app/views/main/service/services/flume.js    |  11 +-
 .../app/views/main/service/services/hive.js     |   6 +-
 ambari-web/test/utils/config_test.js            |  22 ++
 .../views/main/service/info/summary_test.js     |  48 ----
 47 files changed, 1144 insertions(+), 973 deletions(-)
----------------------------------------------------------------------


Reply via email to