You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/12/23 16:07:30 UTC

[51/51] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade

Merge branch 'trunk' into branch-dev-patch-upgrade


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 99ce307715bf1c482ccca4e3682d6a500d18b291
Parents: 6ae63ef c998117
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Dec 23 10:06:13 2015 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Dec 23 10:06:13 2015 -0500

----------------------------------------------------------------------
 KEYS                                            |   57 +
 LICENSE.txt                                     |    7 +-
 .../clusters/ClustersManageAccessCtrl.js        |   14 +-
 .../controllers/clusters/UserAccessListCtrl.js  |   12 +-
 .../controllers/groups/GroupsEditCtrl.js        |    4 +-
 .../stackVersions/StackVersionsListCtrl.js      |   13 +-
 .../scripts/controllers/users/UsersShowCtrl.js  |    5 +-
 .../app/views/clusters/userAccessList.html      |    7 +-
 .../ui/admin-web/app/views/groups/edit.html     |    8 +-
 .../ui/admin-web/app/views/leftNavbar.html      |    2 +-
 .../resources/ui/admin-web/app/views/main.html  |    4 +-
 .../admin-web/app/views/stackVersions/list.html |    2 +-
 .../ui/admin-web/app/views/users/list.html      |    3 +
 .../ui/admin-web/app/views/users/show.html      |   12 +-
 .../stackVersions/StackversionsListCtrl_test.js |   53 +-
 ambari-agent/conf/unix/ambari-agent             |    4 +
 ambari-agent/pom.xml                            |    2 +-
 .../src/main/python/ambari_agent/Controller.py  |    2 +-
 .../src/main/python/ambari_agent/NetUtil.py     |    9 +-
 .../main/python/ambari_agent/RecoveryManager.py |   32 +-
 .../python/ambari_agent/alerts/metric_alert.py  |    7 +-
 .../ambari_agent/alerts/recovery_alert.py       |   16 +-
 .../python/ambari_agent/alerts/web_alert.py     |   12 +
 .../src/main/python/ambari_agent/hostname.py    |    2 +
 .../src/main/python/ambari_agent/main.py        |    2 +-
 .../src/test/python/ambari_agent/TestAlerts.py  |   34 +-
 .../python/ambari_agent/TestCertGeneration.py   |    2 -
 .../TestCustomServiceOrchestrator.py            |    1 -
 .../TestHostCheckReportFileHandler.py           |   13 +-
 .../test/python/ambari_agent/TestHostCleanup.py |    6 +-
 .../src/test/python/ambari_agent/TestMain.py    |    1 -
 .../test/python/ambari_agent/TestMetricAlert.py |    1 -
 .../python/ambari_agent/TestRecoveryManager.py  |   60 +-
 .../python/ambari_agent/TestRegistration.py     |    1 -
 .../test/python/ambari_agent/TestScriptAlert.py |    1 -
 .../resource_management/TestDatanodeHelper.py   |    1 -
 .../TestDirectoryResource.py                    |    2 +-
 .../resource_management/TestLinkResource.py     |    6 +-
 .../resource_management/TestPackageResource.py  |   17 +-
 .../resource_management/TestPackagesAnalyzer.py |   40 +
 .../TestRepositoryResource.py                   |   50 +-
 ambari-client/python-client/pom.xml             |    2 +-
 .../python/json/ambariclient_get_config.json    |    2 +-
 .../main/python/ambari_commons/exceptions.py    |   10 +-
 .../main/python/ambari_commons/inet_utils.py    |   24 +-
 .../python/resource_management/core/base.py     |   16 +-
 .../python/resource_management/core/logger.py   |   29 +
 .../core/providers/package/apt.py               |    8 +-
 .../core/providers/package/yumrpm.py            |    8 +-
 .../core/providers/package/zypper.py            |    8 +-
 .../core/providers/system.py                    |   47 +-
 .../core/resources/system.py                    |   81 +-
 .../python/resource_management/core/shell.py    |   16 +-
 .../python/resource_management/core/sudo.py     |   63 +-
 .../libraries/functions/conf_select.py          |  332 +-
 .../libraries/functions/constants.py            |    4 +-
 .../libraries/functions/copy_tarball.py         |   16 +-
 .../libraries/functions/curl_krb_request.py     |    4 +-
 .../libraries/functions/decorator.py            |   40 +-
 .../libraries/functions/get_lzo_packages.py     |    4 +-
 .../libraries/functions/hdp_select.py           |   19 +
 .../libraries/functions/hive_check.py           |    5 +-
 .../libraries/functions/packages_analyzer.py    |    9 +
 .../libraries/functions/ranger_functions.py     |  131 +-
 .../libraries/functions/ranger_functions_v2.py  |   46 +-
 .../functions/setup_ranger_plugin_xml.py        |    2 +-
 .../libraries/functions/version.py              |   10 +-
 .../libraries/providers/hdfs_resource.py        |    8 +-
 .../libraries/providers/repository.py           |   37 +-
 .../libraries/script/script.py                  |   69 +-
 ambari-funtest/pom.xml                          |  557 ++
 ambari-funtest/src/main/assemblies/funtest.xml  |   79 +
 .../funtest/server/AmbariHttpWebRequest.java    |  393 +
 .../ambari/funtest/server/AmbariUserRole.java   |   68 +
 .../funtest/server/ClusterConfigParams.java     |   84 +
 .../ambari/funtest/server/ConnectionParams.java |   89 +
 .../funtest/server/LocalAmbariServer.java       |   92 +
 .../ambari/funtest/server/WebRequest.java       |  192 +
 .../ambari/funtest/server/WebResponse.java      |   57 +
 .../AddDesiredConfigurationWebRequest.java      |  108 +
 .../api/cluster/CreateClusterWebRequest.java    |   88 +
 .../cluster/CreateConfigurationWebRequest.java  |   87 +
 .../api/cluster/DeleteClusterWebRequest.java    |   60 +
 .../api/cluster/GetAllClustersWebRequest.java   |   53 +
 .../api/cluster/GetClusterWebRequest.java       |   49 +
 .../api/cluster/GetRequestStatusWebRequest.java |   78 +
 .../api/cluster/SetUserPrivilegeWebRequest.java |   96 +
 .../server/api/host/AddHostWebRequest.java      |   63 +
 .../server/api/host/GetHostWebRequest.java      |   56 +
 .../api/host/GetRegisteredHostWebRequest.java   |   59 +
 .../server/api/host/RegisterHostWebRequest.java |   59 +
 .../api/service/AddServiceWebRequest.java       |   98 +
 .../api/service/DeleteServiceWebRequest.java    |   67 +
 .../api/service/GetServiceWebRequest.java       |   67 +
 .../api/service/InstallServiceWebRequest.java   |   39 +
 .../api/service/SetServiceStateWebRequest.java  |   97 +
 .../api/service/StartServiceWebRequest.java     |   38 +
 .../api/service/StopServiceWebRequest.java      |   38 +
 .../AddServiceComponentWebRequest.java          |   69 +
 .../GetServiceComponentWebRequest.java          |   69 +
 .../SetServiceComponentStateWebRequest.java     |   87 +
 .../AddServiceComponentHostWebRequest.java      |   69 +
 .../BulkAddServiceComponentHostsWebRequest.java |  127 +
 ...kSetServiceComponentHostStateWebRequest.java |   91 +
 .../GetServiceComponentHostWebRequest.java      |   69 +
 .../SetServiceComponentHostStateWebRequest.java |   89 +
 .../server/api/user/CreateUserWebRequest.java   |   95 +
 .../server/api/user/DeleteUserWebRequest.java   |   56 +
 .../server/orm/InMemoryDefaultTestModule.java   |   88 +
 .../funtest/server/tests/DeleteServiceTest.java |  205 +
 .../funtest/server/tests/GetStacksTest.java     |  102 +
 .../tests/RoleBasedAccessControlBasicTest.java  |  249 +
 .../funtest/server/tests/ServerTestBase.java    |  259 +
 .../funtest/server/utils/ClusterUtils.java      |  292 +
 .../server/utils/RequestStatusPoller.java       |   93 +
 .../funtest/server/utils/RestApiUtils.java      |   52 +
 .../src/test/resources/log4j.properties         |   21 +
 .../src/test/resources/os_family.json           |   45 +
 .../test/resources/stacks/HDP/0.1/metainfo.xml  |   22 +
 .../resources/stacks/HDP/0.1/repos/repoinfo.xml |   57 +
 .../services/HDFS/configuration/hbase-site.xml  |  137 +
 .../services/HDFS/configuration/hdfs-site.xml   |  396 +
 .../stacks/HDP/0.1/services/HDFS/metainfo.xml   |  155 +
 .../MAPREDUCE/configuration/hbase-site.xml      |  137 +
 .../MAPREDUCE/configuration/hdfs-site.xml       |  396 +
 .../MAPREDUCE/configuration/mapred-site.xml     |  400 +
 .../HDP/0.1/services/MAPREDUCE/metainfo.xml     |   89 +
 .../services/PIG/configuration/pig.properties   |   52 +
 .../stacks/HDP/0.1/services/PIG/metainfo.xml    |   61 +
 .../test/resources/stacks/HDP/0.2/metainfo.xml  |   22 +
 .../resources/stacks/HDP/0.2/repos/repoinfo.xml |   57 +
 .../services/HBASE/configuration/hbase-site.xml |  137 +
 .../stacks/HDP/0.2/services/HBASE/metainfo.xml  |  121 +
 .../0.2/services/HDFS/configuration/global.xml  |  145 +
 .../services/HDFS/configuration/hadoop-env.xml  |  230 +
 .../services/HDFS/configuration/hbase-site.xml  |  137 +
 .../services/HDFS/configuration/hdfs-log4j.xml  |  202 +
 .../services/HDFS/configuration/hdfs-site.xml   |  396 +
 .../stacks/HDP/0.2/services/HDFS/metainfo.xml   |  134 +
 .../stacks/HDP/0.2/services/HIVE/metainfo.xml   |  127 +
 .../services/MAPREDUCE/configuration/global.xml |  160 +
 .../MAPREDUCE/configuration/hbase-site.xml      |  137 +
 .../MAPREDUCE/configuration/hdfs-site.xml       |  396 +
 .../MAPREDUCE/configuration/mapred-site.xml     |  400 +
 .../HDP/0.2/services/MAPREDUCE/metainfo.xml     |   97 +
 .../HDP/0.2/services/ZOOKEEPER/metainfo.xml     |   72 +
 .../resources/stacks/HDP/1.2.0/metainfo.xml     |   22 +
 .../stacks/HDP/1.2.0/repos/repoinfo.xml         |  123 +
 .../HDP/1.2.0/services/GANGLIA/metainfo.xml     |   97 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  344 +
 .../HDP/1.2.0/services/HBASE/metainfo.xml       |  120 +
 .../HDP/1.2.0/services/HCATALOG/metainfo.xml    |   57 +
 .../services/HDFS/configuration/core-site.xml   |  251 +
 .../HDFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HDFS/configuration/hdfs-site.xml   |  408 +
 .../stacks/HDP/1.2.0/services/HDFS/metainfo.xml |  137 +
 .../services/HIVE/configuration/hive-site.xml   |  132 +
 .../stacks/HDP/1.2.0/services/HIVE/metainfo.xml |  143 +
 .../configuration/capacity-scheduler.xml        |  195 +
 .../MAPREDUCE/configuration/core-site.xml       |   20 +
 .../configuration/mapred-queue-acls.xml         |   39 +
 .../MAPREDUCE/configuration/mapred-site.xml     |  537 ++
 .../HDP/1.2.0/services/MAPREDUCE/metainfo.xml   |   86 +
 .../services/OOZIE/configuration/oozie-site.xml |  245 +
 .../HDP/1.2.0/services/OOZIE/metainfo.xml       |  110 +
 .../services/PIG/configuration/pig.properties   |   52 +
 .../stacks/HDP/1.2.0/services/PIG/metainfo.xml  |   60 +
 .../HDP/1.2.0/services/SQOOP/metainfo.xml       |   73 +
 .../WEBHCAT/configuration/webhcat-site.xml      |  126 +
 .../HDP/1.2.0/services/WEBHCAT/metainfo.xml     |   95 +
 .../HDP/1.2.0/services/ZOOKEEPER/metainfo.xml   |   72 +
 .../resources/stacks/HDP/1.3.0/metainfo.xml     |   23 +
 .../stacks/HDP/1.3.0/repos/repoinfo.xml         |  111 +
 .../services/GANGLIA/configuration/global.xml   |   55 +
 .../HDP/1.3.0/services/GANGLIA/metainfo.xml     |   97 +
 .../services/HBASE/configuration/global.xml     |  179 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  365 +
 .../HDP/1.3.0/services/HBASE/metainfo.xml       |  120 +
 .../services/HCATALOG/configuration/global.xml  |   45 +
 .../HDP/1.3.0/services/HCATALOG/metainfo.xml    |   57 +
 .../services/HDFS/configuration/core-site.xml   |  253 +
 .../services/HDFS/configuration/global.xml      |  202 +
 .../HDFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HDFS/configuration/hdfs-site.xml   |  418 +
 .../stacks/HDP/1.3.0/services/HDFS/metainfo.xml |  136 +
 .../services/HIVE/configuration/global.xml      |  120 +
 .../services/HIVE/configuration/hive-site.xml   |  237 +
 .../stacks/HDP/1.3.0/services/HIVE/metainfo.xml |  143 +
 .../1.3.0/services/HUE/configuration/global.xml |   35 +
 .../services/HUE/configuration/hue-site.xml     |  290 +
 .../stacks/HDP/1.3.0/services/HUE/metainfo.xml  |   35 +
 .../configuration/capacity-scheduler.xml        |  195 +
 .../MAPREDUCE/configuration/core-site.xml       |   20 +
 .../services/MAPREDUCE/configuration/global.xml |  160 +
 .../configuration/mapred-queue-acls.xml         |   39 +
 .../MAPREDUCE/configuration/mapred-site.xml     |  537 ++
 .../HDP/1.3.0/services/MAPREDUCE/metainfo.xml   |   86 +
 .../services/OOZIE/configuration/global.xml     |  105 +
 .../services/OOZIE/configuration/oozie-site.xml |  245 +
 .../HDP/1.3.0/services/OOZIE/metainfo.xml       |  110 +
 .../services/PIG/configuration/pig.properties   |   52 +
 .../stacks/HDP/1.3.0/services/PIG/metainfo.xml  |   60 +
 .../HDP/1.3.0/services/SQOOP/metainfo.xml       |   73 +
 .../WEBHCAT/configuration/webhcat-site.xml      |  126 +
 .../HDP/1.3.0/services/WEBHCAT/metainfo.xml     |   34 +
 .../services/ZOOKEEPER/configuration/global.xml |   75 +
 .../HDP/1.3.0/services/ZOOKEEPER/metainfo.xml   |   71 +
 .../resources/stacks/HDP/1.3.1/metainfo.xml     |   23 +
 .../stacks/HDP/1.3.1/repos/repoinfo.xml         |   97 +
 .../HDP/1.3.1/services/GANGLIA/metainfo.xml     |   97 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  345 +
 .../HDP/1.3.1/services/HBASE/metainfo.xml       |  121 +
 .../HDP/1.3.1/services/HCATALOG/metainfo.xml    |   57 +
 .../services/HCFS/configuration/core-site.xml   |  251 +
 .../HCFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HCFS/configuration/hdfs-site.xml   |  408 +
 .../stacks/HDP/1.3.1/services/HCFS/metainfo.xml |   33 +
 .../services/HDFS/configuration/core-site.xml   |  251 +
 .../HDFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HDFS/configuration/hdfs-site.xml   |  408 +
 .../stacks/HDP/1.3.1/services/HDFS/metainfo.xml |  136 +
 .../services/HIVE/configuration/hive-site.xml   |  132 +
 .../stacks/HDP/1.3.1/services/HIVE/metainfo.xml |  143 +
 .../configuration/capacity-scheduler.xml        |  195 +
 .../MAPREDUCE/configuration/core-site.xml       |   20 +
 .../configuration/mapred-queue-acls.xml         |   39 +
 .../MAPREDUCE/configuration/mapred-site.xml     |  531 ++
 .../HDP/1.3.1/services/MAPREDUCE/metainfo.xml   |   86 +
 .../HDP/1.3.1/services/NONAME/metainfo.xml      |   33 +
 .../services/OOZIE/configuration/oozie-site.xml |  245 +
 .../HDP/1.3.1/services/OOZIE/metainfo.xml       |  110 +
 .../services/PIG/configuration/pig.properties   |   52 +
 .../stacks/HDP/1.3.1/services/PIG/metainfo.xml  |   60 +
 .../HDP/1.3.1/services/SQOOP/metainfo.xml       |   73 +
 .../WEBHCAT/configuration/webhcat-site.xml      |  126 +
 .../HDP/1.3.1/services/WEBHCAT/metainfo.xml     |   95 +
 .../HDP/1.3.1/services/ZOOKEEPER/metainfo.xml   |   72 +
 .../resources/stacks/HDP/1.3.4/metainfo.xml     |   22 +
 .../HDP/1.3.4/services/GANGLIA/metainfo.xml     |   96 +
 .../HDP/1.3.4/services/HBASE/metainfo.xml       |  122 +
 .../services/HDFS/configuration/hdfs-log4j.xml  |  198 +
 .../stacks/HDP/1.3.4/services/HDFS/metainfo.xml |  136 +
 .../stacks/HDP/1.3.4/services/HIVE/metainfo.xml |  179 +
 .../stacks/HDP/1.3.4/services/HUE/metainfo.xml  |   36 +
 .../HDP/1.3.4/services/MAPREDUCE/metainfo.xml   |  102 +
 .../HDP/1.3.4/services/OOZIE/metainfo.xml       |  110 +
 .../stacks/HDP/1.3.4/services/PIG/metainfo.xml  |   60 +
 .../HDP/1.3.4/services/SQOOP/metainfo.xml       |   75 +
 .../HDP/1.3.4/services/WEBHCAT/metainfo.xml     |   94 +
 .../HDP/1.3.4/services/ZOOKEEPER/metainfo.xml   |   71 +
 .../resources/stacks/HDP/2.0.1/metainfo.xml     |   22 +
 .../stacks/HDP/2.0.1/repos/repoinfo.xml         |   75 +
 .../HDP/2.0.1/services/GANGLIA/metainfo.xml     |  129 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  350 +
 .../HDP/2.0.1/services/HBASE/metainfo.xml       |  112 +
 .../HDP/2.0.1/services/HCATALOG/metainfo.xml    |   56 +
 .../services/HDFS/configuration/core-site.xml   |  257 +
 .../services/HDFS/configuration/global.xml      |  202 +
 .../HDFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HDFS/configuration/hdfs-site.xml   |  431 +
 .../stacks/HDP/2.0.1/services/HDFS/metainfo.xml |  158 +
 .../services/HIVE/configuration/hive-site.xml   |  136 +
 .../stacks/HDP/2.0.1/services/HIVE/metainfo.xml |  156 +
 .../configuration/container-executor.cfg        |   20 +
 .../MAPREDUCE2/configuration/core-site.xml      |   20 +
 .../MAPREDUCE2/configuration/global.xml         |   44 +
 .../configuration/mapred-queue-acls.xml         |   39 +
 .../MAPREDUCE2/configuration/mapred-site.xml    |  300 +
 .../HDP/2.0.1/services/MAPREDUCE2/metainfo.xml  |   87 +
 .../services/OOZIE/configuration/oozie-site.xml |  245 +
 .../HDP/2.0.1/services/OOZIE/metainfo.xml       |  140 +
 .../services/PIG/configuration/pig.properties   |   52 +
 .../stacks/HDP/2.0.1/services/PIG/metainfo.xml  |   62 +
 .../stacks/HDP/2.0.1/services/TEZ/metainfo.xml  |   34 +
 .../WEBHCAT/configuration/webhcat-site.xml      |  126 +
 .../HDP/2.0.1/services/WEBHCAT/metainfo.xml     |  102 +
 .../YARN/configuration/capacity-scheduler.xml   |  112 +
 .../YARN/configuration/container-executor.cfg   |   20 +
 .../services/YARN/configuration/core-site.xml   |   20 +
 .../services/YARN/configuration/global.xml      |   49 +
 .../services/YARN/configuration/yarn-site.xml   |  172 +
 .../stacks/HDP/2.0.1/services/YARN/metainfo.xml |  110 +
 .../HDP/2.0.1/services/ZOOKEEPER/metainfo.xml   |   75 +
 .../resources/stacks/HDP/2.0.5/metainfo.xml     |   22 +
 .../stacks/HDP/2.0.5/repos/repoinfo.xml         |   61 +
 .../HDP/2.0.5/services/GANGLIA/metainfo.xml     |  130 +
 .../services/HBASE/configuration/global.xml     |  179 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  363 +
 .../HDP/2.0.5/services/HBASE/metainfo.xml       |  112 +
 .../HDP/2.0.5/services/HBASE/metrics.json       | 3206 +++++++
 .../HDP/2.0.5/services/HCATALOG/metainfo.xml    |   56 +
 .../stacks/HDP/2.0.5/services/HDFS/alerts.json  |  144 +
 .../services/HDFS/configuration/core-site.xml   |  195 +
 .../services/HDFS/configuration/global.xml      |  197 +
 .../HDFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HDFS/configuration/hdfs-site.xml   |  454 +
 .../stacks/HDP/2.0.5/services/HDFS/metainfo.xml |  196 +
 .../stacks/HDP/2.0.5/services/HDFS/metrics.json | 2961 +++++++
 .../services/HIVE/configuration/hive-site.xml   |  255 +
 .../stacks/HDP/2.0.5/services/HIVE/metainfo.xml |  260 +
 .../configuration/container-executor.cfg        |   20 +
 .../MAPREDUCE2/configuration/core-site.xml      |   20 +
 .../MAPREDUCE2/configuration/global.xml         |   44 +
 .../configuration/mapred-queue-acls.xml         |   39 +
 .../MAPREDUCE2/configuration/mapred-site.xml    |  382 +
 .../HDP/2.0.5/services/MAPREDUCE2/metainfo.xml  |   87 +
 .../services/OOZIE/configuration/oozie-site.xml |  245 +
 .../HDP/2.0.5/services/OOZIE/metainfo.xml       |  140 +
 .../services/PIG/configuration/pig.properties   |   52 +
 .../stacks/HDP/2.0.5/services/PIG/metainfo.xml  |   62 +
 .../HDP/2.0.5/services/SQOOP/metainfo.xml       |   73 +
 .../YARN/configuration/capacity-scheduler.xml   |  112 +
 .../YARN/configuration/container-executor.cfg   |   20 +
 .../services/YARN/configuration/core-site.xml   |   20 +
 .../services/YARN/configuration/global.xml      |   64 +
 .../services/YARN/configuration/yarn-site.xml   |  311 +
 .../stacks/HDP/2.0.5/services/YARN/metainfo.xml |  115 +
 .../stacks/HDP/2.0.5/services/YARN/metrics.json | 1661 ++++
 .../services/ZOOKEEPER/configuration/global.xml |   75 +
 .../ZOOKEEPER/configuration/zoo.cfg.xml         |   62 +
 .../HDP/2.0.5/services/ZOOKEEPER/metainfo.xml   |   89 +
 .../stacks/HDP/2.0.6.1/hooks/dummy-script.py    |   20 +
 .../resources/stacks/HDP/2.0.6.1/metainfo.xml   |   24 +
 .../stacks/HDP/2.0.6.1/repos/repoinfo.xml       |   61 +
 .../stacks/HDP/2.0.6.1/role_command_order.json  |   92 +
 .../services/FLUME/configuration/flume-conf.xml |   34 +
 .../services/FLUME/configuration/flume-env.xml  |   44 +
 .../FLUME/configuration/flume-log4j.xml         |   31 +
 .../HDP/2.0.6.1/services/FLUME/metainfo.xml     |   69 +
 .../HDP/2.0.6.1/services/HBASE/metainfo.xml     |   27 +
 .../HDP/2.0.6.1/services/SQOOP/metainfo.xml     |   34 +
 .../HDP/2.0.6.1/services/YARN/metainfo.xml      |   27 +
 .../stacks/HDP/2.0.6/hooks/dummy-script.py      |   20 +
 .../resources/stacks/HDP/2.0.6/metainfo.xml     |   24 +
 .../stacks/HDP/2.0.6/repos/repoinfo.xml         |   61 +
 .../stacks/HDP/2.0.6/role_command_order.json    |   92 +
 .../services/FLUME/configuration/flume-conf.xml |   34 +
 .../services/FLUME/configuration/flume-env.xml  |   44 +
 .../FLUME/configuration/flume-log4j.xml         |   34 +
 .../HDP/2.0.6/services/FLUME/metainfo.xml       |   69 +
 .../HDP/2.0.6/services/HBASE/metainfo.xml       |  113 +
 .../HDP/2.0.6/services/SQOOP/metainfo.xml       |   34 +
 .../services/YARN/configuration/yarn-site.xml   |  117 +
 .../stacks/HDP/2.0.6/services/YARN/metainfo.xml |  122 +
 .../resources/stacks/HDP/2.0.7/metainfo.xml     |   24 +
 .../stacks/HDP/2.0.7/repos/repoinfo.xml         |   61 +
 .../stacks/HDP/2.0.7/role_command_order.json    |   92 +
 .../services/HBASE/configuration/global.xml     |  174 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  356 +
 .../HDP/2.0.7/services/HBASE/metainfo.xml       |  130 +
 .../services/HBASE/package/dummy-script.py      |   20 +
 .../services/HDFS/configuration/core-site.xml   |  167 +
 .../services/HDFS/configuration/global.xml      |  202 +
 .../HDFS/configuration/hadoop-policy.xml        |  134 +
 .../services/HDFS/configuration/hdfs-site.xml   |  514 ++
 .../stacks/HDP/2.0.7/services/HDFS/metainfo.xml |  158 +
 .../2.0.7/services/HDFS/package/dummy-script.py |   20 +
 .../services/HIVE/configuration/hive-site.xml   |  261 +
 .../stacks/HDP/2.0.7/services/HIVE/metainfo.xml |  174 +
 .../services/HIVE/package/files/addMysqlUser.sh |   41 +
 .../services/HIVE/package/files/hcatSmoke.sh    |   35 +
 .../services/HIVE/package/files/hiveSmoke.sh    |   23 +
 .../services/HIVE/package/files/hiveserver2.sql |   23 +
 .../HIVE/package/files/hiveserver2Smoke.sh      |   31 +
 .../services/HIVE/package/files/pigSmoke.sh     |   18 +
 .../HIVE/package/files/startHiveserver2.sh      |   22 +
 .../HIVE/package/files/startMetastore.sh        |   22 +
 .../services/HIVE/package/scripts/__init__.py   |   19 +
 .../2.0.7/services/HIVE/package/scripts/hcat.py |   47 +
 .../HIVE/package/scripts/hcat_client.py         |   43 +
 .../HIVE/package/scripts/hcat_service_check.py  |   63 +
 .../2.0.7/services/HIVE/package/scripts/hive.py |  123 +
 .../HIVE/package/scripts/hive_client.py         |   41 +
 .../HIVE/package/scripts/hive_metastore.py      |   63 +
 .../HIVE/package/scripts/hive_server.py         |   63 +
 .../HIVE/package/scripts/hive_service.py        |   56 +
 .../HIVE/package/scripts/mysql_server.py        |   77 +
 .../HIVE/package/scripts/mysql_service.py       |   44 +
 .../services/HIVE/package/scripts/params.py     |  123 +
 .../HIVE/package/scripts/service_check.py       |   56 +
 .../HIVE/package/scripts/status_params.py       |   30 +
 .../HIVE/package/templates/hcat-env.sh.j2       |   25 +
 .../HIVE/package/templates/hive-env.sh.j2       |   55 +
 .../HDP/2.0.7/services/SQOOP/metainfo.xml       |   39 +
 .../services/YARN/config-mr2/mapred-site.xml    |   28 +
 .../services/YARN/configuration/yarn-site.xml   |   60 +
 .../stacks/HDP/2.0.7/services/YARN/metainfo.xml |  171 +
 .../HDP/2.0.7/services/ZOOKEEPER/metainfo.xml   |   89 +
 .../stacks/HDP/2.0.8/hooks/dummy-script.py      |   20 +
 .../resources/stacks/HDP/2.0.8/kerberos.json    |   42 +
 .../resources/stacks/HDP/2.0.8/metainfo.xml     |   24 +
 .../stacks/HDP/2.0.8/repos/repoinfo.xml         |   61 +
 .../stacks/HDP/2.0.8/role_command_order.json    |   79 +
 .../HDP/2.0.8/services/FAKENAGIOS/metainfo.xml  |   51 +
 .../services/HBASE/configuration/hbase-site.xml |  356 +
 .../HDP/2.0.8/services/HBASE/metainfo.xml       |   84 +
 .../services/HDFS/configuration/hdfs-site.xml   |   45 +
 .../HDP/2.0.8/services/HDFS/kerberos.json       |  141 +
 .../stacks/HDP/2.0.8/services/HDFS/metainfo.xml |  146 +
 .../stacks/HDP/2.0.8/services/HDFS/metrics.json | 7860 +++++++++++++++++
 .../2.0.8/services/HDFS/package/dummy-script.py |   20 +
 .../HDP/2.0.8/services/SQOOP/metainfo.xml       |   40 +
 .../resources/stacks/HDP/2.1.1/metainfo.xml     |   24 +
 .../resources/stacks/HDP/2.1.1/repos/hdp.json   |   10 +
 .../stacks/HDP/2.1.1/repos/repoinfo.xml         |   62 +
 .../stacks/HDP/2.1.1/role_command_order.json    |   81 +
 .../2.1.1/services/AMBARI_METRICS/metainfo.xml  |  133 +
 .../stacks/HDP/2.1.1/services/HDFS/metainfo.xml |  146 +
 .../PIG/configuration/pig-properties.xml        |   94 +
 .../stacks/HDP/2.1.1/services/PIG/metainfo.xml  |   34 +
 .../2.1.1/services/PIG/role_command_order.json  |   12 +
 .../STORM/configuration/placeholder.txt         |   17 +
 .../HDP/2.1.1/services/STORM/metainfo.xml       |  106 +
 .../HDP/2.1.1/services/STORM/metrics.json       |  114 +
 .../services/STORM/package/placeholder.txt      |   17 +
 .../stacks/HDP/2.1.1/services/TEZ/metainfo.xml  |   34 +
 .../HDP/2.1.1/upgrades/config-upgrade.xml       |  133 +
 .../HDP/2.1.1/upgrades/upgrade_bucket_test.xml  |   88 +
 .../HDP/2.1.1/upgrades/upgrade_direction.xml    |  101 +
 .../upgrades/upgrade_nonrolling_new_stack.xml   |  974 +++
 .../upgrades/upgrade_server_action_test.xml     |   65 +
 .../stacks/HDP/2.1.1/upgrades/upgrade_test.xml  |  211 +
 .../HDP/2.1.1/upgrades/upgrade_test_checks.xml  |  203 +
 .../2.1.1/upgrades/upgrade_test_nonrolling.xml  |  190 +
 .../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml |  213 +
 .../resources/stacks/HDP/2.2.0.ECS/metainfo.xml |   24 +
 .../stacks/HDP/2.2.0.ECS/repos/hdp.json         |   10 +
 .../stacks/HDP/2.2.0.ECS/repos/repoinfo.xml     |   62 +
 .../HDP/2.2.0.ECS/services/ECS/metainfo.xml     |   35 +
 .../HDP/2.2.0.ECS/services/HDFS/metainfo.xml    |   28 +
 .../resources/stacks/HDP/2.2.0/metainfo.xml     |   24 +
 .../resources/stacks/HDP/2.2.0/repos/hdp.json   |   10 +
 .../stacks/HDP/2.2.0/repos/repoinfo.xml         |   62 +
 .../stacks/HDP/2.2.0/role_command_order.json    |   81 +
 .../HDP/2.2.0/services/GANGLIA/metainfo.xml     |   39 +
 .../stacks/HDP/2.2.0/services/HDFS/metainfo.xml |   59 +
 .../HDP/2.2.0/services/ZOOKEEPER/metainfo.xml   |   40 +
 .../HDP/2.2.0/upgrades/config-upgrade.xml       |  101 +
 .../stacks/HDP/2.2.0/upgrades/upgrade_test.xml  |  221 +
 .../HDP/2.2.0/upgrades/upgrade_test_checks.xml  |  208 +
 .../upgrades/upgrade_test_skip_failures.xml     |   74 +
 .../resources/stacks/OTHER/1.0/metainfo.xml     |   23 +
 .../resources/stacks/OTHER/1.0/repos/hdp.json   |   10 +
 .../stacks/OTHER/1.0/repos/repoinfo.xml         |   62 +
 .../stacks/OTHER/1.0/role_command_order.json    |   92 +
 .../services/HDFS/configuration/hdfs-site.xml   |   45 +
 .../stacks/OTHER/1.0/services/HDFS/metainfo.xml |  146 +
 .../stacks/OTHER/1.0/services/HDFS/metrics.json | 7861 ++++++++++++++++++
 .../1.0/services/HDFS/package/dummy-script.py   |   20 +
 .../OTHER/1.0/services/SQOOP2/metainfo.xml      |   30 +
 .../STORM/configuration/placeholder.txt         |   17 +
 .../OTHER/1.0/services/STORM/metainfo.xml       |   29 +
 .../OTHER/1.0/services/STORM/metrics.json       |  103 +
 .../1.0/services/STORM/package/placeholder.txt  |   17 +
 .../resources/stacks/OTHER/2.0/metainfo.xml     |   24 +
 .../resources/stacks/OTHER/2.0/repos/hdp.json   |   10 +
 .../stacks/OTHER/2.0/repos/repoinfo.xml         |   62 +
 .../OTHER/2.0/services/HBASE/metainfo.xml       |   32 +
 .../OTHER/2.0/services/HBASE/widgets.json       |  190 +
 .../OTHER/2.0/services/SQOOP2/metainfo.xml      |   28 +
 .../stacks/XYZ/1.0.0/services/stack_advisor.py  |   67 +
 .../stacks/XYZ/1.0.1/services/stack_advisor.py  |   30 +
 ambari-funtest/src/test/resources/version       |    1 +
 ambari-metrics/ambari-metrics-assembly/pom.xml  |    2 +-
 ambari-metrics/ambari-metrics-common/pom.xml    |   17 +
 .../conf/unix/ambari-metrics-collector          |  141 +-
 .../ambari-metrics-timelineservice/pom.xml      |    7 +-
 .../timeline/TimelineMetricConfiguration.java   |    4 +-
 .../query/DefaultPhoenixDataSource.java         |    2 +-
 .../TestApplicationHistoryServer.java           |    2 +-
 ambari-metrics/pom.xml                          |    8 +-
 ambari-project/pom.xml                          |    1 -
 ambari-server/conf/unix/ambari.properties       |    3 +-
 ambari-server/pom.xml                           |  104 +-
 .../server/actionmanager/ActionScheduler.java   |   12 +
 .../actionmanager/ExecutionCommandWrapper.java  |    2 -
 .../ambari/server/agent/ExecutionCommand.java   |   11 +
 .../resources/ResourceInstanceFactoryImpl.java  |    4 +
 .../StackServiceResourceDefinition.java         |    1 +
 .../server/api/services/AmbariMetaInfo.java     |    1 +
 .../ambari/server/api/services/BaseRequest.java |    1 +
 .../server/api/services/ClusterService.java     |   84 +-
 .../services/ClusterStackVersionService.java    |    2 +-
 .../server/api/services/LogoutService.java      |    5 +-
 .../server/api/services/StacksService.java      |   36 +
 .../api/services/ViewInstanceService.java       |   52 +-
 .../server/checks/AbstractCheckDescriptor.java  |   34 -
 .../ambari/server/checks/CheckDescription.java  |    2 +-
 .../server/checks/InstallPackagesCheck.java     |   14 +
 .../server/configuration/Configuration.java     |   12 -
 .../controller/ActionExecutionContext.java      |    4 +-
 .../controller/AmbariActionExecutionHelper.java |   86 +-
 .../AmbariCustomCommandExecutionHelper.java     |   82 +-
 .../controller/AmbariManagementController.java  |   32 +-
 .../AmbariManagementControllerImpl.java         |  301 +-
 .../ambari/server/controller/AmbariServer.java  |    6 +
 .../server/controller/KerberosHelper.java       |   36 +-
 .../server/controller/KerberosHelperImpl.java   |  509 +-
 .../AbstractControllerResourceProvider.java     |   40 +
 .../internal/AbstractPropertyProvider.java      |  170 +-
 .../AlertDefinitionResourceProvider.java        |   86 +-
 .../internal/AlertGroupResourceProvider.java    |   46 +-
 .../internal/AlertHistoryResourceProvider.java  |   43 +
 .../internal/AlertNoticeResourceProvider.java   |   33 +-
 .../internal/AlertResourceProvider.java         |   45 +-
 .../internal/AlertResourceProviderUtils.java    |  403 +
 .../internal/AlertTargetResourceProvider.java   |   27 +-
 .../BlueprintConfigurationProcessor.java        |   83 +-
 .../controller/internal/CalculatedStatus.java   |   25 +-
 .../internal/ClientConfigResourceProvider.java  |    5 +-
 .../internal/ClusterResourceProvider.java       |  121 +-
 .../ClusterStackVersionResourceProvider.java    |    2 +-
 .../internal/ComponentResourceProvider.java     |   42 +-
 .../internal/ConfigGroupResourceProvider.java   |   92 +-
 .../internal/ConfigurationResourceProvider.java |   16 +-
 .../internal/CredentialResourceProvider.java    |   19 +-
 .../internal/DefaultProviderModule.java         |    2 +-
 .../internal/GroupResourceProvider.java         |   16 +-
 .../internal/HostComponentResourceProvider.java |   32 +-
 .../internal/HostResourceProvider.java          |   81 +-
 .../internal/LdapSyncEventResourceProvider.java |   29 +-
 .../internal/MemberResourceProvider.java        |   16 +-
 .../internal/ProvisionClusterRequest.java       |   44 +-
 .../QuickLinkArtifactResourceProvider.java      |  201 +
 .../RepositoryVersionResourceProvider.java      |   51 +-
 .../internal/RequestResourceProvider.java       |  234 +-
 .../ServiceConfigVersionResourceProvider.java   |    8 +-
 .../internal/ServiceResourceProvider.java       |  120 +-
 .../internal/StackDefinedPropertyProvider.java  |   11 +-
 .../internal/StageResourceProvider.java         |    8 +-
 .../internal/TaskResourceProvider.java          |   45 +-
 .../internal/UpgradeItemResourceProvider.java   |    1 +
 .../internal/UpgradeResourceProvider.java       |  101 +-
 .../internal/ViewInstanceResourceProvider.java  |   16 +-
 .../internal/ViewPrivilegeResourceProvider.java |    8 +
 .../internal/ViewResourceProvider.java          |   16 +-
 .../controller/jmx/JMXPropertyProvider.java     |    2 +-
 .../metrics/MetricsPropertyProvider.java        |    7 +-
 .../metrics/MetricsPropertyProviderProxy.java   |    9 +-
 .../MetricsReportPropertyProviderProxy.java     |    6 +-
 .../metrics/RestMetricsPropertyProvider.java    |    2 +-
 .../ThreadPoolEnabledPropertyProvider.java      |    8 +-
 .../ambari/server/controller/spi/Resource.java  |    2 +
 .../controller/utilities/PredicateBuilder.java  |    8 +
 .../listeners/alerts/AlertHostListener.java     |    6 +-
 .../server/orm/dao/HostRoleCommandDAO.java      |    2 +-
 .../apache/ambari/server/orm/dao/UserDAO.java   |    5 +
 .../orm/entities/AlertDefinitionEntity.java     |    3 +-
 .../server/orm/entities/AlertTargetEntity.java  |    5 +-
 .../orm/entities/ClusterConfigEntity.java       |   18 +-
 .../security/AbstractSecurityHeaderFilter.java  |   68 +-
 .../AmbariServerSecurityHeaderFilter.java       |   17 +-
 .../AmbariViewsSecurityHeaderFilter.java        |   12 +-
 .../AmbariAuthorizationFilter.java              |   62 +-
 .../authorization/AuthorizationHelper.java      |   42 +-
 .../authorization/RoleAuthorization.java        |   56 +-
 .../server/security/authorization/Users.java    |   13 +-
 .../authorization/jwt/JwtAuthentication.java    |   10 +-
 .../jwt/JwtAuthenticationFilter.java            |  115 +-
 .../encryption/CredentialStoreServiceImpl.java  |    7 +-
 .../encryption/MasterKeyServiceImpl.java        |    4 +-
 .../kerberos/CreateKeytabFilesServerAction.java |  162 +-
 .../kerberos/CreatePrincipalsServerAction.java  |  261 +-
 .../serveraction/upgrades/ConfigureAction.java  |   35 +-
 .../upgrades/HiveZKQuorumConfigAction.java      |   95 +
 .../upgrades/UpdateDesiredStackAction.java      |   51 +-
 .../upgrades/YarnConfigCalculation.java         |   77 +
 .../upgrades/ZooKeeperQuorumCalculator.java     |   75 +
 .../stack/QuickLinksConfigurationModule.java    |  139 +
 .../ambari/server/stack/ServiceModule.java      |   44 +-
 .../org/apache/ambari/server/state/Cluster.java |   22 +-
 .../ambari/server/state/ConfigHelper.java       |  115 +-
 .../ambari/server/state/ConfigMergeHelper.java  |   36 +-
 .../ambari/server/state/DesiredConfig.java      |   56 +-
 .../state/QuickLinksConfigurationInfo.java      |   87 +
 .../apache/ambari/server/state/ServiceInfo.java |   48 +
 .../server/state/cluster/ClusterImpl.java       |  154 +-
 .../server/state/configgroup/ConfigGroup.java   |    3 +
 .../ambari/server/state/quicklinks/Check.java   |   60 +
 .../ambari/server/state/quicklinks/Link.java    |  127 +
 .../ambari/server/state/quicklinks/Port.java    |  116 +
 .../server/state/quicklinks/Protocol.java       |   51 +
 .../server/state/quicklinks/QuickLinks.java     |   78 +
 .../quicklinks/QuickLinksConfiguration.java     |   91 +
 .../ambari/server/topology/AmbariContext.java   |   52 +-
 .../topology/ClusterConfigurationRequest.java   |   42 +
 .../ambari/server/topology/ClusterTopology.java |   10 +
 .../server/topology/ClusterTopologyImpl.java    |   13 +
 .../ambari/server/topology/HostRequest.java     |   46 +-
 .../ambari/server/topology/TopologyManager.java |   30 +-
 .../ambari/server/update/HostUpdateHelper.java  |   13 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |   15 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |   30 +-
 .../server/upgrade/UpgradeCatalog213.java       | 1190 ---
 .../server/upgrade/UpgradeCatalog220.java       | 1549 +++-
 .../server/upgrade/UpgradeCatalog221.java       |  304 +
 .../server/upgrade/UpgradeCatalog230.java       |  385 +
 .../apache/ambari/server/utils/StageUtils.java  |   30 +-
 .../apache/ambari/server/view/ViewRegistry.java |   43 +-
 .../ambari_server/dbConfiguration_linux.py      |    2 +-
 .../main/python/ambari_server/serverUpgrade.py  |   17 +-
 .../main/python/ambari_server/setupSecurity.py  |    1 +
 .../src/main/python/ambari_server_main.py       |   20 +-
 ambari-server/src/main/python/upgradeHelper.py  |   36 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  | 1533 ++++
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   31 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   31 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   31 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |   31 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   31 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   31 +-
 .../package/scripts/accumulo_configuration.py   |    8 +-
 .../package/scripts/accumulo_service.py         |   12 +-
 .../AMBARI_METRICS/0.1.0/alerts.json            |   29 +-
 .../0.1.0/configuration/ams-env.xml             |   12 +-
 .../0.1.0/configuration/ams-hbase-env.xml       |    8 +-
 .../configuration/ams-hbase-security-site.xml   |    7 -
 .../0.1.0/configuration/ams-hbase-site.xml      |   17 +-
 .../0.1.0/configuration/ams-site.xml            |   11 +-
 .../AMBARI_METRICS/0.1.0/kerberos.json          |    6 +-
 .../AMBARI_METRICS/0.1.0/metainfo.xml           |    2 +-
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |   34 +-
 .../0.1.0/package/scripts/ams_service.py        |    9 +-
 .../0.1.0/package/scripts/hbase.py              |   36 +-
 .../0.1.0/package/scripts/params.py             |   13 +-
 .../0.1.0/package/scripts/service_check.py      |   20 +-
 .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml |    3 +
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |   10 +-
 .../FALCON/0.5.0.2.1/metainfo.xml               |    6 +
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py  |   26 +-
 .../0.5.0.2.1/package/scripts/falcon_client.py  |    2 +-
 .../0.5.0.2.1/package/scripts/falcon_server.py  |    2 +-
 .../FALCON/0.5.0.2.1/quicklinks/quicklinks.json |   28 +
 .../FLUME/1.4.0.2.0/package/scripts/flume.py    |    2 +-
 .../GANGLIA/3.5.0/package/scripts/ganglia.py    |    2 +-
 .../3.5.0/package/scripts/ganglia_monitor.py    |    2 +-
 .../3.5.0/package/scripts/ganglia_server.py     |   13 +-
 .../HAWQ/2.0.0/configuration/hawq-env.xml       |   35 +
 .../HAWQ/2.0.0/configuration/hawq-site.xml      |  126 +-
 .../HAWQ/2.0.0/configuration/hdfs-client.xml    |  280 +
 .../HAWQ/2.0.0/configuration/yarn-client.xml    |   99 +
 .../common-services/HAWQ/2.0.0/kerberos.json    |   60 +
 .../common-services/HAWQ/2.0.0/metainfo.xml     |   31 +-
 .../HAWQ/2.0.0/package/scripts/common.py        |  206 +-
 .../HAWQ/2.0.0/package/scripts/constants.py     |   61 -
 .../2.0.0/package/scripts/hawq_constants.py     |   66 +
 .../HAWQ/2.0.0/package/scripts/hawqmaster.py    |    9 +-
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py   |   25 +-
 .../HAWQ/2.0.0/package/scripts/hawqstandby.py   |    6 +-
 .../HAWQ/2.0.0/package/scripts/hawqstatus.py    |   10 +-
 .../HAWQ/2.0.0/package/scripts/master_helper.py |   59 +-
 .../HAWQ/2.0.0/package/scripts/params.py        |   48 +-
 .../HAWQ/2.0.0/package/scripts/service_check.py |   22 +-
 .../HAWQ/2.0.0/package/scripts/utils.py         |   18 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py   |   12 +-
 .../package/scripts/hbase_decommission.py       |    2 +-
 .../0.96.0.2.0/package/scripts/params_linux.py  |    2 +
 .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml  |    2 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |    2 +-
 .../package/scripts/datanode_upgrade.py         |   17 +-
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py      |    8 +-
 .../2.1.0.2.0/package/scripts/hdfs_datanode.py  |    6 +-
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |   21 +-
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |    2 +-
 .../2.1.0.2.0/package/scripts/journalnode.py    |    2 +-
 .../package/scripts/journalnode_upgrade.py      |    4 +-
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |   23 +-
 .../package/scripts/namenode_upgrade.py         |   28 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |    2 +-
 .../package/scripts/setup_ranger_hdfs.py        |   14 +-
 .../HDFS/2.1.0.2.0/package/scripts/utils.py     |   22 +-
 .../common-services/HIVE/0.12.0.2.0/alerts.json |   20 +-
 .../package/alerts/alert_hive_metastore.py      |   11 +-
 .../package/alerts/alert_hive_thrift_port.py    |   10 +-
 .../HIVE/0.12.0.2.0/package/scripts/hcat.py     |    6 +-
 .../0.12.0.2.0/package/scripts/hcat_client.py   |   37 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |    8 +-
 .../package/scripts/hive_metastore.py           |    4 +-
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py  |    8 +-
 .../KAFKA/0.8.1.2.2/package/scripts/kafka.py    |  111 +-
 .../0.8.1.2.2/package/scripts/kafka_broker.py   |   17 +-
 .../0.8.1.2.2/package/scripts/service_check.py  |   23 +-
 .../package/scripts/kerberos_common.py          |    6 +-
 .../package/scripts/kerberos_server.py          |    4 +-
 .../KNOX/0.5.0.2.2/package/scripts/knox.py      |   51 +-
 .../0.5.0.2.2/package/scripts/knox_gateway.py   |   14 +-
 .../0.5.0.2.2/package/scripts/params_linux.py   |    3 +-
 .../MAHOUT/1.0.0.2.3/package/scripts/mahout.py  |    2 +-
 .../4.0.0.2.0/configuration/oozie-site.xml      |    2 +-
 .../package/alerts/alert_check_oozie_server.py  |   35 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |   26 +-
 .../4.2.0.2.3/configuration/oozie-site.xml      |    2 +-
 .../PIG/0.12.0.2.0/package/scripts/pig.py       |    2 +-
 .../PXF/3.0.0/package/scripts/pxf.py            |    2 +-
 .../common-services/RANGER/0.4.0/alerts.json    |    2 +-
 .../0.4.0/configuration/usersync-properties.xml |    7 +-
 .../RANGER/0.4.0/package/scripts/params.py      |    9 +
 .../0.4.0/package/scripts/ranger_service.py     |    6 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   12 +-
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |   82 +-
 .../SLIDER/0.60.0.2.2/package/scripts/slider.py |    7 +-
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |   12 +-
 .../1.2.0.2.2/package/scripts/setup_spark.py    |    3 +-
 .../SQOOP/1.4.4.2.0/package/scripts/sqoop.py    |    2 +-
 .../STORM/0.9.1.2.1/metainfo.xml                |    9 +
 .../STORM/0.9.1.2.1/package/scripts/service.py  |    6 +-
 .../STORM/0.9.1.2.1/package/scripts/storm.py    |   24 +-
 .../0.9.1.2.1/package/scripts/storm_upgrade.py  |    4 +-
 .../STORM/0.9.1.2.1/quicklinks/quicklinks.json  |   28 +
 .../0.4.0.2.1/package/scripts/pre_upgrade.py    |    2 +-
 .../0.4.0.2.1/package/scripts/service_check.py  |    6 +
 .../TEZ/0.4.0.2.1/package/scripts/tez.py        |    2 +-
 .../alerts/alert_nodemanagers_summary.py        |   22 +-
 .../package/scripts/nodemanager_upgrade.py      |    4 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |    3 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |   40 +-
 .../3.4.5.2.0/package/files/zkSmoke.sh          |    2 +-
 .../3.4.5.2.0/package/scripts/params_linux.py   |    2 +
 .../3.4.5.2.0/package/scripts/service_check.py  |    6 +-
 .../3.4.5.2.0/package/scripts/zookeeper.py      |   10 +-
 .../custom_actions/scripts/check_host.py        |   19 +-
 .../custom_actions/scripts/install_packages.py  |   93 +-
 .../custom_actions/scripts/ru_set_all.py        |   33 +-
 .../main/resources/scripts/Ambaripreupload.py   |  362 +-
 .../resources/scripts/takeover_config_merge.py  |  224 +
 .../before-ANY/scripts/shared_initialization.py |    2 +-
 .../scripts/shared_initialization.py            |    6 +-
 .../0.8/services/FLUME/package/scripts/flume.py |    2 +-
 .../services/GANGLIA/package/scripts/ganglia.py |    2 +-
 .../GANGLIA/package/scripts/ganglia_monitor.py  |    2 +-
 .../GANGLIA/package/scripts/ganglia_server.py   |    6 +-
 .../0.8/services/HBASE/package/scripts/hbase.py |   10 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../0.8/services/HDFS/package/scripts/hdfs.py   |    2 +-
 .../HDFS/package/scripts/hdfs_datanode.py       |    4 +-
 .../HDFS/package/scripts/hdfs_namenode.py       |    4 +-
 .../HDFS/package/scripts/hdfs_snamenode.py      |    2 +-
 .../HDFS/package/scripts/journalnode.py         |    2 +-
 .../0.8/services/HDFS/package/scripts/utils.py  |    4 +-
 .../0.8/services/HIVE/package/scripts/hcat.py   |    6 +-
 .../0.8/services/HIVE/package/scripts/hive.py   |    4 +-
 .../services/HIVE/package/scripts/webhcat.py    |    6 +-
 .../0.8/services/OOZIE/package/scripts/oozie.py |    4 +-
 .../0.8/services/PIG/package/scripts/pig.py     |    2 +-
 .../package/scripts/mapred_service_check.py     |    2 +-
 .../0.8/services/YARN/package/scripts/yarn.py   |   10 +-
 .../ZOOKEEPER/package/scripts/zookeeper.py      |    8 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../scripts/shared_initialization.py            |   82 +-
 .../before-ANY/scripts/shared_initialization.py |   16 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |    2 +
 .../before-START/scripts/rack_awareness.py      |    4 +-
 .../scripts/shared_initialization.py            |   10 +-
 .../HDP/2.0.6/services/OOZIE/metainfo.xml       |    7 +
 .../services/OOZIE/quicklinks/quicklinks.json   |   45 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  101 +-
 .../services/FALCON/package/scripts/falcon.py   |    4 +-
 .../services/STORM/package/scripts/storm.py     |    2 +-
 .../services/TEZ/package/scripts/tez.py         |    2 +-
 .../services/YARN/package/scripts/yarn.py       |   10 +-
 .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml |   45 +-
 .../stacks/HDP/2.2/role_command_order.json      |    2 +-
 .../stacks/HDP/2.2/services/FALCON/metainfo.xml |    8 +-
 .../stacks/HDP/2.2/services/FLUME/metainfo.xml  |    9 +-
 .../stacks/HDP/2.2/services/HBASE/metainfo.xml  |   12 +-
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml   |   23 +-
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml   |   14 +-
 .../stacks/HDP/2.2/services/KAFKA/metainfo.xml  |    6 +-
 .../stacks/HDP/2.2/services/KNOX/metainfo.xml   |    6 +-
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml  |   16 +-
 .../stacks/HDP/2.2/services/PIG/metainfo.xml    |    4 +-
 .../stacks/HDP/2.2/services/RANGER/metainfo.xml |   16 +-
 .../services/RANGER/quicklinks/quicklinks.json  |   35 +
 .../stacks/HDP/2.2/services/SLIDER/metainfo.xml |   10 +-
 .../stacks/HDP/2.2/services/SPARK/metainfo.xml  |   16 +-
 .../services/SPARK/quicklinks/quicklinks.json   |   28 +
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml  |    8 +-
 .../stacks/HDP/2.2/services/STORM/metainfo.xml  |    8 +-
 .../2.2/services/TEZ/configuration/tez-site.xml |    7 +-
 .../stacks/HDP/2.2/services/TEZ/metainfo.xml    |    8 +-
 .../stacks/HDP/2.2/services/YARN/metainfo.xml   |   14 +-
 .../HDP/2.2/services/ZOOKEEPER/metainfo.xml     |   25 -
 .../stacks/HDP/2.2/services/stack_advisor.py    |    2 +-
 .../stacks/HDP/2.2/upgrades/config-upgrade.xml  |   39 +
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml |    5 +-
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml |   28 +-
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml     |    8 +-
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     |   25 +-
 .../services/YARN/configuration/yarn-site.xml   |   29 +
 .../HDP/2.3.ECS/services/YARN/metainfo.xml      |   64 +
 .../stacks/HDP/2.3/role_command_order.json      |    1 +
 .../HDP/2.3/services/ACCUMULO/metainfo.xml      |   11 +-
 .../ACCUMULO/quicklinks/quicklinks.json         |   40 +
 .../stacks/HDP/2.3/services/ATLAS/metainfo.xml  |   10 +-
 .../services/ATLAS/quicklinks/quicklinks.json   |   35 +
 .../stacks/HDP/2.3/services/FALCON/metainfo.xml |   18 -
 .../stacks/HDP/2.3/services/FLUME/metainfo.xml  |   20 -
 .../stacks/HDP/2.3/services/HBASE/metainfo.xml  |   31 +-
 .../services/HBASE/quicklinks/quicklinks.json   |  103 +
 .../stacks/HDP/2.3/services/HDFS/metainfo.xml   |   31 +-
 .../services/HDFS/quicklinks/quicklinks.json    |   80 +
 .../stacks/HDP/2.3/services/HDFS/widgets.json   |    6 +-
 .../services/HIVE/configuration/hive-site.xml   |   16 +
 .../stacks/HDP/2.3/services/HIVE/metainfo.xml   |   19 +-
 .../stacks/HDP/2.3/services/KAFKA/metainfo.xml  |   20 +-
 .../stacks/HDP/2.3/services/KNOX/metainfo.xml   |   18 -
 .../stacks/HDP/2.3/services/OOZIE/metainfo.xml  |   17 +-
 .../services/OOZIE/quicklinks/quicklinks.json   |   45 +
 .../stacks/HDP/2.3/services/PIG/metainfo.xml    |    8 +-
 .../stacks/HDP/2.3/services/RANGER/alerts.json  |    2 +-
 .../RANGER/configuration/ranger-ugsync-site.xml |    2 +-
 .../stacks/HDP/2.3/services/RANGER/metainfo.xml |   31 +-
 .../services/RANGER/quicklinks/quicklinks.json  |   40 +
 .../services/RANGER/themes/theme_version_2.json |  130 +-
 .../HDP/2.3/services/RANGER_KMS/metainfo.xml    |    4 +-
 .../stacks/HDP/2.3/services/SLIDER/metainfo.xml |   24 -
 .../configuration/spark-hive-site-override.xml  |   12 +
 .../stacks/HDP/2.3/services/SPARK/metainfo.xml  |   30 +-
 .../services/SPARK/quicklinks/quicklinks.json   |   28 +
 .../stacks/HDP/2.3/services/SQOOP/metainfo.xml  |   27 -
 .../stacks/HDP/2.3/services/STORM/metainfo.xml  |   18 -
 .../stacks/HDP/2.3/services/TEZ/metainfo.xml    |   20 -
 .../services/YARN/configuration/yarn-site.xml   |    2 +-
 .../stacks/HDP/2.3/services/YARN/metainfo.xml   |   59 +-
 .../YARN/quicklinks-mapred/quicklinks.json      |   80 +
 .../services/YARN/quicklinks/quicklinks.json    |   80 +
 .../HDP/2.3/services/ZOOKEEPER/metainfo.xml     |   13 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |  139 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  205 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |    7 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     |    9 +-
 .../HDP/2.4/services/ACCUMULO/metainfo.xml      |   29 -
 .../stacks/HDP/2.4/services/ATLAS/metainfo.xml  |   20 +-
 .../stacks/HDP/2.4/services/FALCON/metainfo.xml |   18 -
 .../stacks/HDP/2.4/services/FLUME/metainfo.xml  |   20 -
 .../stacks/HDP/2.4/services/HBASE/metainfo.xml  |   28 +-
 .../stacks/HDP/2.4/services/HDFS/metainfo.xml   |   73 -
 .../stacks/HDP/2.4/services/HIVE/metainfo.xml   |   89 +-
 .../stacks/HDP/2.4/services/KAFKA/metainfo.xml  |   20 +-
 .../stacks/HDP/2.4/services/KNOX/metainfo.xml   |   18 -
 .../stacks/HDP/2.4/services/OOZIE/metainfo.xml  |   44 -
 .../stacks/HDP/2.4/services/PIG/metainfo.xml    |   24 -
 .../stacks/HDP/2.4/services/RANGER/metainfo.xml |   26 -
 .../HDP/2.4/services/RANGER_KMS/metainfo.xml    |   20 -
 .../stacks/HDP/2.4/services/SLIDER/metainfo.xml |   24 -
 .../stacks/HDP/2.4/services/SPARK/metainfo.xml  |   26 +-
 .../stacks/HDP/2.4/services/SQOOP/metainfo.xml  |   27 -
 .../stacks/HDP/2.4/services/STORM/metainfo.xml  |   19 -
 .../stacks/HDP/2.4/services/TEZ/metainfo.xml    |   20 -
 .../stacks/HDP/2.4/services/YARN/metainfo.xml   |   46 -
 .../HDP/2.4/services/ZOOKEEPER/metainfo.xml     |   25 -
 .../catalog/UpgradeCatalog_2.2_to_2.3.json      |  107 +-
 .../server/agent/TestHeartbeatMonitor.java      |   12 +-
 .../server/api/predicate/QueryLexerTest.java    |    5 +-
 .../StackServiceResourceDefinitionTest.java     |    2 +-
 .../ambari/server/bootstrap/BootStrapTest.java  |   18 +-
 .../checks/ClientRetryPropertyCheckTest.java    |    2 -
 .../checks/ComponentsInstallationCheckTest.java |    2 -
 .../checks/ConfigurationMergeCheckTest.java     |    2 -
 .../HiveDynamicServiceDiscoveryCheckTest.java   |    2 -
 .../checks/HiveMultipleMetastoreCheckTest.java  |    2 -
 .../server/checks/HostsHeartbeatCheckTest.java  |    2 -
 .../checks/HostsMasterMaintenanceCheckTest.java |    2 -
 .../checks/HostsRepositoryVersionCheckTest.java |    2 -
 .../server/checks/InstallPackagesCheckTest.java |   22 +-
 ...duce2JobHistoryStatePreservingCheckTest.java |    2 -
 .../SecondaryNamenodeDeletedCheckTest.java      |    2 -
 .../ServicesMaintenanceModeCheckTest.java       |    2 -
 ...vicesMapReduceDistributedCacheCheckTest.java |    2 -
 ...rvicesNamenodeHighAvailabilityCheckTest.java |    2 -
 .../ServicesNamenodeTruncateCheckTest.java      |    2 -
 .../ServicesTezDistributedCacheCheckTest.java   |    2 -
 .../server/checks/ServicesUpCheckTest.java      |    2 -
 .../ServicesYarnWorkPreservingCheckTest.java    |    2 -
 ...nTimelineServerStatePreservingCheckTest.java |    2 -
 .../AmbariCustomCommandExecutionHelperTest.java |  366 +-
 .../AmbariManagementControllerImplTest.java     |    1 +
 .../AmbariManagementControllerTest.java         |  142 +-
 .../BackgroundCustomCommandExecutionTest.java   |   35 +-
 .../server/controller/KerberosHelperTest.java   |  732 +-
 ...hYarnCapacitySchedulerReleaseConfigTest.java |   30 +-
 .../ActiveWidgetLayoutResourceProviderTest.java |   17 +-
 .../AlertDefinitionResourceProviderTest.java    |  253 +-
 .../AlertGroupResourceProviderTest.java         |  402 +-
 .../AlertHistoryResourceProviderTest.java       |  146 +-
 .../AlertNoticeResourceProviderTest.java        |  145 +-
 .../internal/AlertResourceProviderTest.java     |  213 +-
 .../AlertTargetResourceProviderTest.java        |  341 +-
 .../AmbariPrivilegeResourceProviderTest.java    |   14 +-
 .../BlueprintConfigurationProcessorTest.java    |  276 +-
 .../ClusterPrivilegeResourceProviderTest.java   |   14 +-
 .../internal/ClusterResourceProviderTest.java   | 1046 +--
 ...leRepositoryVersionResourceProviderTest.java |    6 +
 .../internal/ComponentResourceProviderTest.java |  179 +-
 .../ConfigGroupResourceProviderTest.java        |   17 +-
 .../ConfigurationResourceProviderTest.java      |   10 +
 .../CredentialResourceProviderTest.java         |  162 +-
 .../internal/GroupResourceProviderTest.java     |   95 +-
 .../HostComponentResourceProviderTest.java      |  101 +-
 .../internal/HostResourceProviderTest.java      |  918 +-
 .../internal/JMXHostProviderTest.java           |   28 +-
 .../LdapSyncEventResourceProviderTest.java      |   10 +
 .../internal/MemberResourceProviderTest.java    |  143 +-
 .../RepositoryVersionResourceProviderTest.java  |   64 +-
 .../internal/RequestResourceProviderTest.java   |  291 +-
 .../internal/ServiceResourceProviderTest.java   |  584 +-
 .../StackDefinedPropertyProviderTest.java       |  201 +-
 .../internal/StageResourceProviderTest.java     |   64 +-
 .../internal/TaskResourceProviderTest.java      |   70 +
 .../internal/UpgradeResourceProviderTest.java   |  111 +-
 .../UserAuthorizationResourceProviderTest.java  |   10 +-
 .../UserPrivilegeResourceProviderTest.java      |   10 +-
 .../internal/UserResourceProviderTest.java      |   24 +-
 .../ViewInstanceResourceProviderTest.java       |   41 +-
 .../metrics/JMXPropertyProviderTest.java        |  291 +-
 .../RestMetricsPropertyProviderTest.java        |  235 +-
 .../ganglia/GangliaPropertyProviderTest.java    |  160 +-
 .../timeline/AMSPropertyProviderTest.java       |  230 +-
 .../api/AmbariHttpWebRequest.java               |  393 -
 .../api/ClusterConfigParams.java                |   84 -
 .../functionaltests/api/ConnectionParams.java   |   89 -
 .../server/functionaltests/api/WebRequest.java  |  192 -
 .../server/functionaltests/api/WebResponse.java |   57 -
 .../AddDesiredConfigurationWebRequest.java      |  108 -
 .../api/cluster/CreateClusterWebRequest.java    |   88 -
 .../cluster/CreateConfigurationWebRequest.java  |   87 -
 .../api/cluster/GetAllClustersWebRequest.java   |   53 -
 .../api/cluster/GetClusterWebRequest.java       |   49 -
 .../api/cluster/GetRequestStatusWebRequest.java |   78 -
 .../api/host/AddHostWebRequest.java             |   63 -
 .../api/host/GetHostWebRequest.java             |   56 -
 .../api/host/GetRegisteredHostWebRequest.java   |   59 -
 .../api/host/RegisterHostWebRequest.java        |   59 -
 .../api/service/AddServiceWebRequest.java       |   98 -
 .../api/service/DeleteServiceWebRequest.java    |   67 -
 .../api/service/GetServiceWebRequest.java       |   67 -
 .../api/service/InstallServiceWebRequest.java   |   39 -
 .../api/service/SetServiceStateWebRequest.java  |   97 -
 .../api/service/StartServiceWebRequest.java     |   38 -
 .../api/service/StopServiceWebRequest.java      |   38 -
 .../AddServiceComponentWebRequest.java          |   69 -
 .../GetServiceComponentWebRequest.java          |   69 -
 .../SetServiceComponentStateWebRequest.java     |   87 -
 .../AddServiceComponentHostWebRequest.java      |   69 -
 .../BulkAddServiceComponentHostsWebRequest.java |  127 -
 ...kSetServiceComponentHostStateWebRequest.java |   91 -
 .../GetServiceComponentHostWebRequest.java      |   69 -
 .../SetServiceComponentHostStateWebRequest.java |   89 -
 .../server/DeleteServiceTest.java               |  197 -
 .../server/LocalAmbariServer.java               |   99 -
 .../functionaltests/server/ServerTestBase.java  |  146 -
 .../server/StartStopServerTest.java             |  102 -
 .../functionaltests/utils/ClusterUtils.java     |  247 -
 .../functionaltests/utils/RestApiUtils.java     |   52 -
 .../server/orm/dao/AlertDefinitionDAOTest.java  |    2 +
 .../server/orm/dao/AlertDispatchDAOTest.java    |    1 +
 .../ambari/server/orm/dao/RequestDAOTest.java   |    2 +
 .../AbstractSecurityHeaderFilterTest.java       |   33 +-
 .../AmbariServerSecurityHeaderFilterTest.java   |   13 +-
 .../AmbariViewsSecurityHeaderFilterTest.java    |   15 +-
 .../security/TestAuthenticationFactory.java     |  264 +-
 .../AmbariAuthorizationFilterTest.java          |  247 +-
 .../authorization/AuthorizationHelperTest.java  |    8 +-
 .../upgrades/ConfigureActionTest.java           |   40 +-
 .../upgrades/HiveZKQuorumConfigActionTest.java  |  109 +
 .../upgrades/UpgradeActionTest.java             |  140 +-
 .../QuickLinksConfigurationModuleTest.java      |  128 +
 .../ambari/server/state/ConfigHelperTest.java   |   18 +
 .../server/state/ConfigMergeHelperTest.java     |  245 +
 .../ambari/server/state/DesiredConfigTest.java  |   17 +
 .../ambari/server/state/UpgradeHelperTest.java  |   14 +-
 .../server/state/cluster/ClusterTest.java       |  100 +
 .../server/topology/AmbariContextTest.java      |  107 +
 .../ClusterConfigurationRequestTest.java        |  175 +
 .../ClusterInstallWithoutStartTest.java         |  377 +
 .../server/update/HostUpdateHelperTest.java     |   27 +
 .../server/upgrade/UpgradeCatalog200Test.java   |    2 +-
 .../server/upgrade/UpgradeCatalog211Test.java   |   29 +-
 .../server/upgrade/UpgradeCatalog213Test.java   | 1445 ----
 .../server/upgrade/UpgradeCatalog220Test.java   | 1715 +++-
 .../server/upgrade/UpgradeCatalog221Test.java   |  412 +
 .../server/upgrade/UpgradeCatalog230Test.java   |  269 +
 .../server/upgrade/UpgradeCatalogTest.java      |    9 +
 .../ambari/server/utils/StageUtilsTest.java     |   11 +
 .../ambari/server/view/ViewRegistryTest.java    |   61 +-
 .../src/test/python/TestAmbariServer.py         |   39 +-
 .../src/test/python/TestResourceFilesKeeper.py  |    2 +-
 .../src/test/python/TestServerUpgrade.py        |   37 +-
 ambari-server/src/test/python/TestSetupAgent.py |    5 -
 .../test/python/custom_actions/TestCheckHost.py |   28 +-
 .../custom_actions/TestInstallPackages.py       |   72 +-
 .../python/custom_actions/TestRemoveBits.py     |  117 +
 .../configs/install_packages_config.json        |    4 +-
 .../python/custom_actions/test_ru_set_all.py    |   87 +-
 .../AMBARI_METRICS/test_metrics_collector.py    |   68 +-
 .../python/stacks/2.0.6/FLUME/test_flume.py     |    8 +-
 .../2.0.6/GANGLIA/test_ganglia_monitor.py       |    4 +-
 .../stacks/2.0.6/GANGLIA/test_ganglia_server.py |   15 +-
 .../stacks/2.0.6/HBASE/test_hbase_client.py     |   22 +-
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |   55 +-
 .../2.0.6/HBASE/test_hbase_regionserver.py      |   50 +-
 .../2.0.6/HBASE/test_phoenix_queryserver.py     |   79 +-
 .../python/stacks/2.0.6/HDFS/test_datanode.py   |   86 +-
 .../stacks/2.0.6/HDFS/test_hdfs_client.py       |    6 +-
 .../stacks/2.0.6/HDFS/test_journalnode.py       |   25 +-
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |  217 +-
 .../python/stacks/2.0.6/HDFS/test_nfsgateway.py |   17 +-
 .../python/stacks/2.0.6/HDFS/test_snamenode.py  |   26 +-
 .../test/python/stacks/2.0.6/HDFS/test_zkfc.py  |   40 +-
 .../stacks/2.0.6/HIVE/test_hcat_client.py       |   36 +-
 .../stacks/2.0.6/HIVE/test_hive_client.py       |   15 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |   30 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   25 +-
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |   26 +-
 .../stacks/2.0.6/OOZIE/test_oozie_client.py     |   12 +-
 .../stacks/2.0.6/OOZIE/test_oozie_server.py     |  100 +-
 .../python/stacks/2.0.6/PIG/test_pig_client.py  |    8 +-
 .../python/stacks/2.0.6/SQOOP/test_sqoop.py     |    5 +-
 .../stacks/2.0.6/YARN/test_historyserver.py     |   68 +-
 .../stacks/2.0.6/YARN/test_mapreduce2_client.py |   38 +-
 .../stacks/2.0.6/YARN/test_nodemanager.py       |   89 +-
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |   38 +-
 .../stacks/2.0.6/YARN/test_yarn_client.py       |   56 +-
 .../2.0.6/ZOOKEEPER/test_zookeeper_client.py    |   18 +-
 .../2.0.6/ZOOKEEPER/test_zookeeper_server.py    |   17 +-
 .../ZOOKEEPER/test_zookeeper_service_check.py   |   15 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |   42 +-
 .../test/python/stacks/2.0.6/configs/nn_eu.json |  367 +
 .../hooks/after-INSTALL/test_after_install.py   |  197 +-
 .../2.0.6/hooks/before-ANY/test_before_any.py   |   15 +-
 .../hooks/before-START/test_before_start.py     |   24 +-
 .../stacks/2.1/FALCON/test_falcon_client.py     |   14 +-
 .../stacks/2.1/FALCON/test_falcon_server.py     |   73 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |  102 +-
 .../python/stacks/2.1/STORM/test_storm_base.py  |   16 +-
 .../stacks/2.1/STORM/test_storm_drpc_server.py  |    2 +-
 .../stacks/2.1/STORM/test_storm_nimbus.py       |   53 +-
 .../stacks/2.1/STORM/test_storm_nimbus_prod.py  |    4 +-
 .../2.1/STORM/test_storm_rest_api_service.py    |    4 +-
 .../stacks/2.1/STORM/test_storm_supervisor.py   |    6 +-
 .../2.1/STORM/test_storm_supervisor_prod.py     |    4 +-
 .../stacks/2.1/STORM/test_storm_ui_server.py    |    6 +-
 .../python/stacks/2.1/TEZ/test_service_check.py |   90 +
 .../python/stacks/2.1/TEZ/test_tez_client.py    |    4 +-
 .../stacks/2.1/YARN/test_apptimelineserver.py   |   22 +-
 .../2.1/configs/hive-metastore-upgrade.json     |  356 +
 .../stacks/2.2/ACCUMULO/test_accumulo_client.py |    2 +-
 .../stacks/2.2/KAFKA/test_kafka_broker.py       |   53 +-
 .../stacks/2.2/KERBEROS/test_kerberos_client.py |   14 +-
 .../stacks/2.2/KERBEROS/test_kerberos_server.py |   24 +-
 .../python/stacks/2.2/KNOX/test_knox_gateway.py |   65 +-
 .../stacks/2.2/RANGER/test_ranger_admin.py      |    2 +-
 .../stacks/2.2/RANGER/test_ranger_usersync.py   |    2 +-
 .../stacks/2.2/SLIDER/test_slider_client.py     |   11 +-
 .../stacks/2.2/SPARK/test_job_history_server.py |   10 +-
 .../stacks/2.2/SPARK/test_spark_client.py       |   10 +-
 .../stacks/2.2/common/test_stack_advisor.py     |   10 +-
 .../2.2/configs/ranger-admin-upgrade.json       |    6 +-
 .../2.2/configs/ranger-usersync-upgrade.json    |    6 +-
 .../stacks/2.3/ATLAS/test_metadata_server.py    |   10 +-
 .../stacks/2.3/MAHOUT/test_mahout_client.py     |    6 +-
 .../src/test/python/stacks/2.3/PXF/test_pxf.py  |  132 +
 .../2.3/SPARK/test_spark_thrift_server.py       |    7 +-
 .../python/stacks/2.3/STORM/test_storm_base.py  |   16 +-
 .../test/python/stacks/2.3/YARN/test_ats_1_5.py |   20 +-
 .../python/stacks/2.3/configs/pxf_default.json  |   77 +
 .../HIVE/0.11.0.2.0.5.0/package/scripts/hcat.py |    2 +-
 .../HIVE/0.11.0.2.0.5.0/package/scripts/hive.py |    4 +-
 .../dummy_stack/HIVE/package/scripts/hcat.py    |    2 +-
 .../dummy_stack/HIVE/package/scripts/hive.py    |    4 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../MAPREDUCE/configuration/hdfs-site.xml       |    2 +-
 .../MAPREDUCE/configuration/mapred-site.xml     |    2 +-
 .../resources/child_quicklinks_to_inherit.json  |    7 +
 .../resources/child_quicklinks_to_merge.json    |   65 +
 .../resources/child_quicklinks_to_override.json |   90 +
 .../HDFS/1.0/configuration/hdfs-site.xml        |    2 +-
 .../MAPREDUCE/1.0/configuration/hdfs-site.xml   |    2 +-
 .../MAPREDUCE/1.0/configuration/mapred-site.xml |    2 +-
 .../test_kerberos_descriptor_2_1_3.json         |    9 +-
 .../src/test/resources/parent_quicklinks.json   |   80 +
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../MAPREDUCE/configuration/hdfs-site.xml       |    2 +-
 .../MAPREDUCE/configuration/mapred-site.xml     |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../MAPREDUCE/configuration/hdfs-site.xml       |    2 +-
 .../MAPREDUCE/configuration/mapred-site.xml     |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../services/HCFS/configuration/hdfs-site.xml   |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../2.0.7/services/HIVE/package/scripts/hcat.py |    2 +-
 .../2.0.7/services/HIVE/package/scripts/hive.py |    4 +-
 .../HDP/2.1.1/upgrades/config-upgrade.xml       |    9 +
 .../upgrades/upgrade_nonrolling_new_stack.xml   |  974 +++
 .../services/HDFS/configuration/hdfs-site.xml   |    2 +-
 .../ambari/shell/support/TableRendererTest.java |   14 +-
 ambari-shell/ambari-python-shell/pom.xml        |    2 +-
 ambari-views/examples/auto-cluster-view/pom.xml |    1 -
 ambari-views/examples/calculator-view/pom.xml   |    1 -
 ambari-views/examples/cluster-view/pom.xml      |    1 -
 ambari-views/examples/favorite-view/pom.xml     |    1 -
 .../examples/hello-servlet-view/pom.xml         |    1 -
 ambari-views/examples/hello-spring-view/pom.xml |    1 -
 ambari-views/examples/helloworld-view/pom.xml   |    1 -
 ambari-views/examples/phone-list-view/pom.xml   |    1 -
 .../examples/property-validator-view/pom.xml    |    1 -
 ambari-views/examples/property-view/pom.xml     |    1 -
 ambari-views/examples/restricted-view/pom.xml   |    1 -
 ambari-views/examples/simple-view/pom.xml       |    1 -
 ambari-views/examples/weather-view/pom.xml      |    1 -
 .../main/java/org/apache/ambari/view/View.java  |    7 +
 ambari-web/app/app.js                           |   57 +-
 .../assets/data/configurations/quicklinks.json  |  102 +
 .../configurations/quicklinks_services.json     |  112 +
 .../data/stacks/HDP-2.1/service_components.json |    6 +-
 .../data/stacks/HDP-2.2/configurations.json     |    2 +-
 .../wizard/stack/hdp/version2.0.1/HDFS.json     |    2 +-
 ambari-web/app/assets/test/tests.js             |   19 +-
 ambari-web/app/controllers.js                   |    3 -
 ambari-web/app/controllers/application.js       |   12 +-
 .../global/background_operations_controller.js  |    4 +-
 .../controllers/global/cluster_controller.js    |   30 +-
 .../app/controllers/global/update_controller.js |   10 +-
 .../global/user_settings_controller.js          |   13 +-
 ambari-web/app/controllers/login_controller.js  |    4 +-
 ambari-web/app/controllers/main.js              |   43 +-
 .../app/controllers/main/admin/advanced.js      |   54 -
 .../controllers/main/admin/authentication.js    |   42 -
 .../nameNode/rollback_controller.js             |   32 +
 .../nameNode/step3_controller.js                |    5 +
 .../nameNode/step9_controller.js                |   21 +-
 .../resourceManager/step4_controller.js         |   59 +-
 .../app/controllers/main/admin/kerberos.js      |   27 +-
 .../main/admin/kerberos/step2_controller.js     |   18 +-
 .../main/admin/kerberos/step4_controller.js     |  108 +-
 .../main/admin/stack_and_upgrade_controller.js  |  240 +-
 .../main/alerts/alert_instances_controller.js   |    4 +-
 .../alerts/definition_details_controller.js     |   22 +-
 .../alerts/manage_alert_groups_controller.js    |   12 +-
 .../manage_alert_notifications_controller.js    |    9 +-
 .../app/controllers/main/charts/heatmap.js      |   30 +-
 ambari-web/app/controllers/main/dashboard.js    |   37 +-
 ambari-web/app/controllers/main/host/details.js |  256 +-
 .../main/host/host_alerts_controller.js         |    4 +-
 ambari-web/app/controllers/main/service.js      |   35 +-
 .../controllers/main/service/add_controller.js  |   87 +-
 .../controllers/main/service/info/configs.js    |   47 +-
 .../controllers/main/service/info/summary.js    |   11 +-
 ambari-web/app/controllers/main/service/item.js |   40 +
 .../service/manage_config_groups_controller.js  |   44 +-
 .../main/service/reassign/step4_controller.js   |    2 +-
 .../wizard/slave_component_groups_controller.js |  351 -
 .../app/controllers/wizard/step4_controller.js  |  153 +-
 .../app/controllers/wizard/step6_controller.js  |    3 +-
 .../app/controllers/wizard/step7_controller.js  |   83 +-
 .../app/controllers/wizard/step8_controller.js  |    4 +-
 ambari-web/app/data/HDP2/ha_properties.js       |   17 +-
 .../data/HDP2/kerberos_descriptor_properties.js |    6 +-
 ambari-web/app/data/HDP2/rm_ha_properties.js    |   28 +-
 ambari-web/app/mappers.js                       |    1 +
 .../app/mappers/configs/config_groups_mapper.js |    6 +-
 .../configs/stack_config_properties_mapper.js   |    2 +-
 ambari-web/app/mappers/quicklinks_mapper.js     |   50 +
 ambari-web/app/messages.js                      |   26 +-
 ambari-web/app/mixins.js                        |    1 +
 .../mixins/common/configs/configs_comparator.js |   14 +-
 .../app/mixins/common/configs/configs_loader.js |    1 +
 .../app/mixins/common/configs/configs_saver.js  |    8 +-
 .../mixins/common/configs/enhanced_configs.js   |   89 +-
 .../common/kdc_credentials_controller_mixin.js  |   17 +-
 ambari-web/app/mixins/common/serverValidator.js |   29 +-
 ambari-web/app/mixins/common/userPref.js        |    2 +-
 .../details/support_client_configs_download.js  |   43 +-
 .../main/service/configs/config_overridable.js  |   72 +-
 .../app/mixins/wizard/addSecurityConfigs.js     |   20 +-
 .../mixins/wizard/assign_master_components.js   |    4 +-
 .../app/mixins/wizard/wizardProgressPageView.js |    4 +-
 ambari-web/app/models.js                        |    1 +
 ambari-web/app/models/alerts/alert_config.js    |    8 +-
 .../app/models/alerts/alert_definition.js       |   10 +-
 ambari-web/app/models/alerts/alert_group.js     |   10 +-
 ambari-web/app/models/cluster_states.js         |   10 +-
 ambari-web/app/models/configs/config_group.js   |   36 +-
 .../models/configs/objects/service_config.js    |  100 +-
 .../configs/objects/service_config_category.js  |   33 +-
 .../configs/objects/service_config_property.js  |   42 +-
 .../models/configs/service_config_version.js    |   61 +-
 .../app/models/configs/theme/sub_section.js     |   18 +-
 .../app/models/configs/theme/sub_section_tab.js |   21 +-
 ambari-web/app/models/configs/theme/tab.js      |   10 +-
 ambari-web/app/models/host.js                   |    4 +-
 ambari-web/app/models/host_component.js         |   10 +-
 .../app/models/quicklinks/quick_links_config.js |   35 +
 ambari-web/app/models/stack_service.js          |    6 +
 .../models/stack_version/repository_version.js  |    4 +-
 ambari-web/app/models/upgrade_entity.js         |    4 +-
 ambari-web/app/models/user.js                   |   72 +-
 ambari-web/app/router.js                        |   68 +-
 .../app/routes/add_alert_definition_routes.js   |    2 +-
 ambari-web/app/routes/add_host_routes.js        |  107 +-
 ambari-web/app/routes/add_service_routes.js     |   11 +-
 ambari-web/app/routes/installer.js              |    2 +-
 ambari-web/app/routes/main.js                   |   34 +-
 ambari-web/app/routes/stack_upgrade_routes.js   |   91 +-
 ambari-web/app/styles/application.less          |   15 +-
 ambari-web/app/styles/common.less               |    5 +
 ambari-web/app/styles/stack_versions.less       |   27 +-
 ambari-web/app/templates/application.hbs        |   29 +-
 .../common/configs/config_history_flow.hbs      |   12 +-
 .../common/configs/notifications_configs.hbs    |    8 +-
 .../common/configs/overriddenProperty.hbs       |    4 +-
 .../templates/common/configs/service_config.hbs |    6 +-
 .../common/configs/service_config_category.hbs  |    4 +-
 .../common/configs/service_config_wizard.hbs    |    4 +-
 .../common/configs/service_version_box.hbs      |    4 +-
 .../common/configs/widgets/controls.hbs         |    8 +-
 .../modal_popups/widget_browser_footer.hbs      |    2 -
 .../modal_popups/widget_browser_popup.hbs       |    4 -
 ambari-web/app/templates/common/settings.hbs    |   18 +-
 .../templates/common/widget/gauge_widget.hbs    |    2 -
 .../templates/common/widget/graph_widget.hbs    |    2 -
 .../templates/common/widget/number_widget.hbs   |    2 -
 .../templates/common/widget/template_widget.hbs |    2 -
 .../app/templates/main/admin/advanced.hbs       |   27 -
 .../templates/main/admin/advanced/uninstall.hbs |   19 -
 ambari-web/app/templates/main/admin/audit.hbs   |   35 -
 .../app/templates/main/admin/authentication.hbs |   48 -
 .../app/templates/main/admin/kerberos.hbs       |   12 +-
 .../stack_upgrade/stack_upgrade_wizard.hbs      |   44 +-
 .../upgrade_configs_merge_table.hbs             |    2 -
 .../admin/stack_upgrade/upgrade_options.hbs     |   10 +-
 .../main/admin/stack_upgrade/versions.hbs       |    4 +-
 ambari-web/app/templates/main/alerts.hbs        |   30 +-
 .../main/alerts/definition_details.hbs          |   26 +-
 ambari-web/app/templates/main/host.hbs          |    4 +-
 .../templates/main/host/bulk_operation_menu.hbs |    4 +-
 ambari-web/app/templates/main/host/details.hbs  |    2 -
 .../main/host/details/host_component.hbs        |   54 +-
 .../app/templates/main/host/stack_versions.hbs  |    4 +-
 ambari-web/app/templates/main/host/summary.hbs  |   16 +-
 .../main/service/all_services_actions.hbs       |   84 +-
 .../app/templates/main/service/info/configs.hbs |    4 +-
 .../app/templates/main/service/info/summary.hbs |    4 +-
 ambari-web/app/templates/main/service/item.hbs  |   64 +-
 .../templates/wizard/slave_component_hosts.hbs  |   32 -
 .../wizard/slave_component_hosts_popup.hbs      |   49 -
 ambari-web/app/utils/ajax/ajax.js               |   50 +-
 ambari-web/app/utils/blueprint.js               |    4 +-
 ambari-web/app/utils/config.js                  |   21 +-
 .../configs/add_component_config_initializer.js |  303 +
 .../app/utils/configs/config_initializer.js     |  628 +-
 .../utils/configs/config_initializer_class.js   |  101 +-
 .../configs/control_flow_initializer_mixin.js   |  127 +
 ambari-web/app/utils/configs/database.js        |  154 +-
 .../configs/ha_config_initializer_class.js      |  167 +-
 .../configs/hosts_based_initializer_mixin.js    |  401 +
 .../mount_points_based_initializer_mixin.js     |  326 +
 .../utils/configs/nn_ha_config_initializer.js   |  101 +-
 .../utils/configs/rm_ha_config_initializer.js   |   68 +-
 ambari-web/app/utils/date/date.js               |    5 +-
 ambari-web/app/utils/db.js                      |    8 +
 ambari-web/app/utils/ember_computed.js          |   22 +-
 ambari-web/app/utils/ember_reopen.js            |   67 +-
 ambari-web/app/utils/helper.js                  |   20 +-
 ambari-web/app/utils/host_progress_popup.js     |    2 +-
 ambari-web/app/utils/hosts.js                   |    8 +-
 ambari-web/app/utils/object_utils.js            |  142 +
 ambari-web/app/utils/polling.js                 |   12 +-
 ambari-web/app/views.js                         |    4 -
 .../common/assign_master_components_view.js     |    8 +-
 ambari-web/app/views/common/chart/linear.js     |    4 +-
 .../app/views/common/chart/linear_time.js       |    8 +-
 ambari-web/app/views/common/chart/pie.js        |    4 +-
 .../views/common/configs/config_history_flow.js |   11 +-
 .../app/views/common/configs/controls_view.js   |    2 +-
 .../notification_configs_view.js                |   29 +-
 .../common/configs/service_config_tab_view.js   |    1 -
 .../views/common/configs/service_config_view.js |   18 +-
 .../configs/service_configs_by_category_view.js |    4 +-
 ambari-web/app/views/common/controls_view.js    |    4 +-
 .../common/form/manage_credentials_form_view.js |    4 +-
 .../common/host_progress_popup_body_view.js     |    7 +-
 ambari-web/app/views/common/modal_popup.js      |    2 +-
 .../modal_popups/confirmation_feedback_popup.js |   20 +-
 .../common/modal_popups/invalid_KDC_popup.js    |    4 +-
 .../manage_kdc_credentials_popup.js             |   10 +-
 .../app/views/common/progress_bar_view.js       |    4 +-
 .../app/views/common/quick_view_link_view.js    |  429 +-
 ambari-web/app/views/common/table_view.js       |    4 +-
 .../views/common/widget/gauge_widget_view.js    |    4 +-
 ambari-web/app/views/main/admin.js              |   26 +-
 ambari-web/app/views/main/admin/advanced.js     |   24 -
 .../app/views/main/admin/advanced/password.js   |   27 -
 ambari-web/app/views/main/admin/audit.js        |   45 -
 .../app/views/main/admin/authentication.js      |   38 -
 .../admin/highAvailability/progress_view.js     |    4 +-
 .../main/admin/stack_upgrade/services_view.js   |    4 +-
 .../admin/stack_upgrade/upgrade_task_view.js    |   16 +-
 .../stack_upgrade/upgrade_version_box_view.js   |   22 +-
 .../admin/stack_upgrade/upgrade_wizard_view.js  |   16 +-
 .../main/admin/stack_upgrade/versions_view.js   |    5 +
 .../views/main/charts/heatmap/heatmap_host.js   |   93 +-
 .../main/charts/heatmap/heatmap_host_detail.js  |   15 +-
 ambari-web/app/views/main/dashboard/widget.js   |    9 +-
 ambari-web/app/views/main/dashboard/widgets.js  |    4 +-
 .../widgets/hbase_regions_in_transition.js      |    4 +-
 .../views/main/dashboard/widgets/hdfs_links.js  |    8 +-
 .../dashboard/widgets/node_managers_live.js     |    4 +-
 .../views/main/dashboard/widgets/text_widget.js |    6 +-
 ambari-web/app/views/main/host/configs.js       |    4 +-
 .../app/views/main/host/configs_service.js      |    4 +-
 .../app/views/main/host/configs_service_menu.js |    4 +-
 ambari-web/app/views/main/host/details.js       |   28 +-
 .../main/host/details/host_component_view.js    |   48 +-
 .../views/main/host/hosts_table_menu_view.js    |  214 +-
 ambari-web/app/views/main/host/metrics.js       |    4 +-
 .../app/views/main/host/stack_versions_view.js  |    4 +-
 ambari-web/app/views/main/host/summary.js       |   17 +-
 ambari-web/app/views/main/menu.js               |   57 +-
 .../views/main/service/all_services_actions.js  |    6 +-
 .../app/views/main/service/info/configs.js      |    8 +
 .../flume/flume_agent_metrics_section.js        |    8 +-
 .../info/metrics/flume/flume_metric_graph.js    |    4 +-
 .../app/views/main/service/info/summary.js      |   10 +-
 ambari-web/app/views/main/service/item.js       |   24 +-
 ambari-web/app/views/main/service/menu.js       |    1 -
 ambari-web/app/views/main/service/service.js    |   19 +-
 .../app/views/main/service/services/flume.js    |    9 +-
 .../app/views/main/service/services/hbase.js    |   46 +-
 .../app/views/main/service/services/hdfs.js     |  113 +-
 .../app/views/main/service/services/yarn.js     |  107 +-
 .../service/widgets/create/expression_view.js   |    5 +-
 .../wizard/step3/hostWarningPopupBody_view.js   |    2 +-
 .../wizard/step3/hostWarningPopupFooter_view.js |    4 +-
 ambari-web/app/views/wizard/step3_view.js       |    4 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |    7 +-
 ambari-web/app/views/wizard/step9_view.js       |   32 +-
 ambari-web/test/aliases/computed/alias.js       |   67 +
 ambari-web/test/aliases/computed/and.js         |   75 +
 .../test/aliases/computed/countBasedMessage.js  |   65 +
 ambari-web/test/aliases/computed/equal.js       |   56 +
 .../test/aliases/computed/equalProperties.js    |   63 +
 ambari-web/test/aliases/computed/everyBy.js     |   85 +
 ambari-web/test/aliases/computed/existsIn.js    |   53 +
 ambari-web/test/aliases/computed/filterBy.js    |   71 +
 ambari-web/test/aliases/computed/findBy.js      |   69 +
 .../test/aliases/computed/firstNotBlank.js      |   60 +
 ambari-web/test/aliases/computed/gt.js          |   63 +
 .../test/aliases/computed/gtProperties.js       |   72 +
 ambari-web/test/aliases/computed/gte.js         |   63 +
 .../test/aliases/computed/gteProperties.js      |   72 +
 ambari-web/test/aliases/computed/ifThenElse.js  |   57 +
 ambari-web/test/aliases/computed/lt.js          |   63 +
 .../test/aliases/computed/ltProperties.js       |   72 +
 ambari-web/test/aliases/computed/lte.js         |   63 +
 .../test/aliases/computed/lteProperties.js      |   72 +
 ambari-web/test/aliases/computed/mapBy.js       |   67 +
 ambari-web/test/aliases/computed/notEqual.js    |   56 +
 .../test/aliases/computed/notEqualProperties.js |   63 +
 ambari-web/test/aliases/computed/notExistsIn.js |   53 +
 ambari-web/test/aliases/computed/or.js          |   76 +
 ambari-web/test/aliases/computed/percents.js    |   55 +
 ambari-web/test/aliases/computed/someBy.js      |   90 +
 ambari-web/test/aliases/computed/sumBy.js       |   67 +
 .../test/aliases/computed/sumProperties.js      |   67 +
 ambari-web/test/app_test.js                     |  154 +-
 ambari-web/test/controllers/application_test.js |   31 +-
 .../test/controllers/experimental_test.js       |    3 +-
 .../global/cluster_controller_test.js           |    6 +
 .../global/update_controller_test.js            |   20 +-
 .../global/user_settings_controller_test.js     |   76 +-
 ambari-web/test/controllers/installer_test.js   |   29 +-
 .../nameNode/step2_controller_test.js           |   42 +-
 .../nameNode/step3_controller_test.js           |   19 +-
 .../progress_popup_controller_test.js           |    4 +
 .../resourceManager/step3_controller_test.js    |   11 +
 .../admin/kerberos/step2_controller_test.js     |   13 +-
 .../admin/kerberos/step4_controller_test.js     |   65 +-
 .../admin/kerberos/step6_controller_test.js     |   14 +-
 .../controllers/main/admin/kerberos_test.js     |   12 +-
 .../admin/stack_and_upgrade_controller_test.js  |  674 +-
 .../add_alert_definition_controller_test.js     |    4 +-
 .../alerts/alert_instances_controller_test.js   |   10 +-
 .../definitions_configs_controller_test.js      |   40 +-
 .../definitions_details_controller_test.js      |   26 +-
 .../manage_alert_groups_controller_test.js      |    9 +-
 ...anage_alert_notifications_controller_test.js |   25 +-
 .../heatmap_metrics/heatmap_metric_test.js      |    2 +-
 .../controllers/main/charts/heatmap_test.js     |  367 +-
 .../dashboard/config_history_controller_test.js |   46 +-
 .../main/host/add_controller_test.js            |   54 +-
 .../test/controllers/main/host/details_test.js  |  947 ++-
 .../main/host/host_alerts_controller_test.js    |   12 +-
 .../main/service/info/config_test.js            |   90 +-
 .../main/service/info/summary_test.js           |   24 +-
 .../test/controllers/main/service/item_test.js  |   23 +-
 .../manage_config_groups_controller_test.js     |  199 +-
 .../service/reassign/step2_controller_test.js   |    4 +-
 .../service/reassign/step3_controller_test.js   |   10 +-
 .../service/reassign/step4_controller_test.js   |  144 +-
 .../service/reassign/step6_controller_test.js   |    2 +-
 .../widgets/create/step1_controller_test.js     |   16 +-
 .../widgets/create/step2_controller_test.js     |   56 +-
 .../widgets/create/step3_controller_test.js     |  106 +-
 .../test/controllers/main/service_test.js       |   64 +-
 ambari-web/test/controllers/main_test.js        |  147 +-
 .../wizard/slave_component_groups_controller.js |  667 --
 .../test/controllers/wizard/step10_test.js      |   11 +-
 .../test/controllers/wizard/step2_test.js       |  130 +-
 .../test/controllers/wizard/step3_test.js       |  141 +-
 .../test/controllers/wizard/step4_test.js       |   40 +-
 .../test/controllers/wizard/step6_test.js       |  141 +-
 .../test/controllers/wizard/step7_test.js       |  142 +-
 .../test/controllers/wizard/step8_test.js       |   96 +-
 .../test/controllers/wizard/step9_test.js       |   60 +-
 ambari-web/test/init_computed_aliases.js        |  196 +
 ambari-web/test/init_test.js                    |    6 +-
 .../common/table_server_view_mixin_test.js      |    8 +-
 .../test/mixins/common/widget_mixin_test.js     |  201 +-
 .../service/configs/config_overridable_test.js  |   95 +
 .../test/models/alerts/alert_definition_test.js |   10 +-
 .../test/models/alerts/alert_group_test.js      |   29 +
 ambari-web/test/models/authentication_test.js   |    4 +
 ambari-web/test/models/cluster_states_test.js   |   13 +-
 .../test/models/configs/config_group_test.js    |  138 +
 .../objects/service_config_category_test.js     |  150 +-
 .../objects/service_config_property_test.js     |   37 +-
 .../configs/objects/service_config_test.js      |  215 +-
 ambari-web/test/models/configs/section_test.js  |   56 +-
 .../configs/service_config_version_test.js      |  302 +-
 .../configs/stack_config_property_test.js       |  128 +
 .../test/models/configs/sub_section_test.js     |   24 +-
 .../test/models/configs/theme/tab_test.js       |   36 +
 ambari-web/test/models/host_component_test.js   |  116 +-
 ambari-web/test/models/host_test.js             |   29 +-
 ambari-web/test/models/repository_test.js       |   12 +-
 .../test/models/stack_service_component_test.js |    2 +
 ambari-web/test/models/stack_service_test.js    |   13 +-
 .../stack_version/repository_version_test.js    |   66 +
 ambari-web/test/models/upgrade_entity_test.js   |   19 +-
 ambari-web/test/models/user_test.js             |  135 +-
 ambari-web/test/router_test.js                  |   14 +-
 ambari-web/test/utils/blueprint_test.js         |    9 +-
 ambari-web/test/utils/config_test.js            |   53 +-
 ambari-web/test/utils/configs/database_test.js  |  113 +-
 ambari-web/test/utils/helper_test.js            |   12 +-
 ambari-web/test/utils/load_timer_test.js        |    4 +-
 ambari-web/test/utils/object_utils_test.js      |  442 +
 .../test/views/common/chart/linear_time_test.js |   18 +-
 .../common/configs/config_history_flow_test.js  |   90 +-
 .../notification_configs_view_test.js           |  201 +-
 .../service_configs_by_category_view_test.js    |    3 +
 .../configs/widgets/config_widget_view_test.js  |   27 +-
 .../widgets/list_config_widget_view_test.js     |   20 +-
 .../widgets/time_interval_spinner_view_test.js  |    2 +-
 .../test/views/common/filter_view_test.js       |   13 +-
 .../form/manage_kdc_credentials_form_test.js    |   16 +-
 .../common/form/spinner_input_view_test.js      |    9 +-
 .../test/views/common/progress_bar_view_test.js |    2 +-
 .../test/views/common/quick_link_view_test.js   |  477 +-
 ambari-web/test/views/common/table_view_test.js |    8 +
 .../nameNode/step3_view_test.js                 |    8 +-
 .../nameNode/step4_view_test.js                 |   16 +-
 .../nameNode/step6_view_test.js                 |    2 +-
 .../nameNode/step8_view_test.js                 |    2 +-
 .../highAvailability/progress_view_test.js      |    4 +-
 .../failed_hosts_modal_view_test.js             |    4 +-
 .../admin/stack_upgrade/services_view_test.js   |   10 +-
 .../stack_upgrade/upgrade_group_view_test.js    |   19 +-
 .../stack_upgrade/upgrade_task_view_test.js     |   62 +-
 .../upgrade_version_box_view_test.js            |   28 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   |  124 +-
 .../admin/stack_upgrade/version_view_test.js    |   71 +-
 ambari-web/test/views/main/admin_test.js        |    4 +-
 .../views/main/alert_definitions_view_test.js   |    8 +-
 .../main/alerts/definition_details_view_test.js |   23 +-
 .../select_definitions_popup_body_view_test.js  |   48 +-
 .../alerts/manage_alert_groups_view_test.js     |   14 +-
 .../main/charts/heatmap/heatmap_host_test.js    |  318 +-
 .../test/views/main/charts/heatmap_test.js      |    4 +-
 .../main/dashboard/config_history_view_test.js  |   65 +-
 .../test/views/main/dashboard/widget_test.js    |   18 +-
 .../widgets/hbase_average_load_test.js          |   10 +
 .../widgets/hbase_regions_in_transition_test.js |   12 +
 .../main/dashboard/widgets/namenode_rpc_test.js |    8 +
 .../widgets/node_managers_live_test.js          |   82 +-
 .../main/dashboard/widgets/text_widget_test.js  |   10 +
 .../test/views/main/dashboard/widgets_test.js   |   65 +-
 .../host/details/host_component_view_test.js    |  197 +-
 .../views/main/host/stack_versions_view_test.js |    6 +-
 ambari-web/test/views/main/host_test.js         |   12 +-
 ambari-web/test/views/main/menu_test.js         |    2 +-
 .../test/views/main/service/info/config_test.js |   39 +-
 .../views/main/service/info/summary_test.js     |    9 +
 ambari-web/test/views/main/service/item_test.js |   15 +
 ambari-web/test/views/wizard/step1_view_test.js |  186 +-
 ambari-web/test/views/wizard/step2_view_test.js |   15 +-
 .../wizard/step3/hostLogPopupBody_view_test.js  |   24 +-
 .../step3/hostWarningPopupBody_view_test.js     |   24 +-
 ambari-web/test/views/wizard/step4_view_test.js |    2 +-
 ambari-web/test/views/wizard/step6_view_test.js |   42 +-
 .../wizard/step9/hostLogPopupBody_view_test.js  |   25 +-
 .../vendor/scripts/jquery.fileDownload.js       |  453 -
 contrib/ambari-scom/ambari-scom-server/pom.xml  |    2 +-
 contrib/ambari-scom/metrics-sink/pom.xml        |    2 +-
 contrib/views/capacity-scheduler/pom.xml        |    5 +-
 contrib/views/files/pom.xml                     |   14 +-
 .../view/filebrowser/DownloadService.java       |   21 +-
 .../files/src/main/resources/ui/app/adapter.js  |    7 +-
 .../ui/app/components/toggleContext.js          |    6 +-
 .../resources/ui/app/components/uploader.js     |    9 +-
 .../main/resources/ui/app/controllers/file.js   |   42 +-
 .../main/resources/ui/app/controllers/files.js  |   10 +-
 .../ui/app/controllers/previewModal.js          |   10 +-
 .../src/main/resources/ui/app/routes/file.js    |    7 +-
 .../ui/app/templates/components/contextMenu.hbs |    8 +-
 .../main/resources/ui/app/templates/files.hbs   |    8 +-
 .../resources/ui/app/templates/util/fileRow.hbs |   12 +-
 .../main/resources/ui/app/views/modalPreview.js |    2 +-
 .../view/filebrowser/FilebrowserTest.java       |    2 +-
 contrib/views/hive/pom.xml                      |   13 +-
 .../ambari/view/hive/client/Connection.java     |    9 +-
 .../ambari/view/hive/client/DDLDelegator.java   |    2 +-
 .../ambari/view/hive/client/HiveCall.java       |   42 +
 .../view/hive/resources/jobs/Aggregator.java    |   24 +-
 .../hive/resources/jobs/atsJobs/ATSParser.java  |   14 +
 .../jobs/atsJobs/ATSRequestsDelegate.java       |    2 +
 .../jobs/atsJobs/ATSRequestsDelegateImpl.java   |   15 +-
 .../resources/jobs/atsJobs/HiveQueryId.java     |    3 +
 .../hive/resources/jobs/atsJobs/IATSParser.java |    2 +
 .../hive-web/app/helpers/format-column-type.js  |    4 +-
 .../resources/ui/hive-web/app/styles/app.scss   |   33 +
 .../templates/components/collapsible-widget.hbs |   10 +-
 .../hive-web/app/templates/databases-tree.hbs   |    6 +-
 .../resources/ui/hive-web/app/views/index.js    |   28 +
 .../src/main/resources/ui/hive-web/bower.json   |    4 +-
 contrib/views/hive/src/main/resources/view.xml  |    1 +
 .../ambari/view/hive/client/ConnectionTest.java |   10 +
 .../view/hive/resources/jobs/ATSParserTest.java |   56 +
 .../hive/resources/jobs/AggregatorTest.java     |   42 +
 contrib/views/pig/pom.xml                       |   14 +-
 .../ambari/view/pig/utils/UserLocalObjects.java |   10 +-
 contrib/views/pig/src/main/resources/view.xml   |    1 +
 .../apache/ambari/view/pig/test/FileTest.java   |    4 +-
 .../apache/ambari/view/pig/test/HelpTest.java   |    4 +-
 .../ambari/view/pig/test/IntegrationalTest.java |   10 +-
 .../apache/ambari/view/pig/test/JobTest.java    |    6 +-
 .../apache/ambari/view/pig/test/ScriptTest.java |    4 +-
 .../view/pig/test/ScriptTestHDFSUnmanaged.java  |    6 +-
 .../view/pig/test/ScriptTestUnmanaged.java      |    4 +-
 contrib/views/pom.xml                           |    1 +
 .../resources/ui/app/models/config_property.js  |    2 +-
 .../ambari/view/tez/rest/BaseProxyResource.java |   12 +-
 .../view/tez/rest/BaseRedirectionResource.java  |   52 +
 .../view/tez/rest/RMRedirectResource.java       |   46 +
 .../resources/ui/scripts/init-ambari-view.js    |    3 +
 contrib/views/tez/src/main/resources/view.xml   |    4 +
 contrib/views/utils/pom.xml                     |   11 +-
 .../org/apache/ambari/view/utils/UserLocal.java |   20 +-
 .../org/apache/ambari/view/utils/ViewImpl.java  |   50 +
 .../apache/ambari/view/utils/ViewUserLocal.java |  116 -
 docs/pom.xml                                    |   44 +-
 docs/src/site/apt/index.apt                     |    2 +-
 docs/src/site/apt/whats-new.apt                 |   24 +-
 docs/src/site/site.xml                          |    2 +
 pom.xml                                         |    6 +-
 1576 files changed, 110047 insertions(+), 23459 deletions(-)
----------------------------------------------------------------------