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 2017/04/27 20:19:58 UTC

[11/50] [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/1f8b527f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f8b527f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f8b527f

Branch: refs/heads/trunk
Commit: 1f8b527f95a262ceb85c2f3436033f65a44860bf
Parents: efcfced 80d0989
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Nov 28 14:22:41 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Nov 28 14:22:41 2016 -0500

----------------------------------------------------------------------
 .../main/resources/ui/admin-web/app/index.html  |    1 +
 .../controllers/groups/GroupsEditCtrl.js        |    5 +-
 .../controllers/groups/GroupsListCtrl.js        |   18 +-
 .../scripts/controllers/users/UsersShowCtrl.js  |    8 +-
 .../ui/admin-web/app/scripts/i18n.config.js     |    1 +
 .../ui/admin-web/app/scripts/services/Group.js  |   33 +-
 .../app/scripts/services/GroupConstants.js      |   38 +
 .../app/scripts/services/UserConstants.js       |    4 +
 .../ui/admin-web/app/views/groups/edit.html     |    8 +-
 .../ui/admin-web/app/views/groups/list.html     |    2 +-
 .../ui/admin-web/app/views/users/show.html      |    8 +-
 ambari-agent/conf/unix/agent-multiplier.py      |   14 +-
 .../src/main/python/ambari_agent/AmbariAgent.py |   19 +-
 .../ambari_agent/CustomServiceOrchestrator.py   |   17 +-
 .../ambari_agent/StatusCommandsExecutor.py      |    4 +-
 .../test/python/ambari_agent/TestAmbariAgent.py |    7 +-
 .../TestCustomServiceOrchestrator.py            |   25 +-
 .../libraries/functions/constants.py            |    1 +
 .../ambari-logsearch-assembly/pom.xml           |    2 +
 .../src/main/resources/solr                     | 1464 +++
 .../ambari-logsearch-portal/pom.xml             |    6 +
 .../org/apache/ambari/logsearch/LogSearch.java  |   14 +-
 .../ambari/logsearch/conf/AuthPropsConfig.java  |   62 +
 .../ambari/logsearch/conf/SecurityConfig.java   |   56 +-
 .../web/filters/LogsearchJWTFilter.java         |  181 +
 ...LogsearchSecurityContextFormationFilter.java |    3 +-
 ...rchUsernamePasswordAuthenticationFilter.java |    1 -
 .../web/model/JWTAuthenticationToken.java       |   53 +
 .../src/main/resources/swagger/swagger.html     |  119 +
 ambari-metrics/ambari-metrics-common/pom.xml    |   11 +-
 .../timeline/AbstractTimelineMetricsSink.java   |   25 +-
 .../availability/MetricCollectorHAHelper.java   |    6 +
 .../AbstractTimelineMetricSinkTest.java         |   98 +
 .../availability/MetricCollectorHATest.java     |   10 +-
 .../ambari-metrics/datasource.js                |    6 +-
 .../conf/unix/ambari-metrics-grafana            |   34 +-
 .../metrics/timeline/TimelineMetricStore.java   |    2 +-
 ambari-server/pom.xml                           |    2 +
 ambari-server/sbin/ambari-server                |    6 +-
 .../server/actionmanager/ActionScheduler.java   |    2 +-
 .../server/agent/RecoveryConfigHelper.java      |   71 +-
 .../checks/DatabaseConsistencyCheckHelper.java  |   10 +-
 .../server/configuration/Configuration.java     |   23 +-
 .../ambari/server/controller/AmbariServer.java  |   23 +-
 .../internal/ClusterControllerImpl.java         |    2 +-
 .../ServiceConfigVersionResourceProvider.java   |    3 +-
 .../internal/UpgradeResourceProvider.java       |    6 +
 .../logging/LoggingSearchPropertyProvider.java  |   11 +-
 .../ambari/server/events/AmbariEvent.java       |    5 +
 .../events/ClusterConfigFinishedEvent.java      |   53 +
 .../server/events/MaintenanceModeEvent.java     |   30 +-
 .../ambari/server/orm/dao/ClusterDAO.java       |   24 +
 .../ambari/server/orm/dao/ServiceConfigDAO.java |   13 +-
 .../orm/entities/ClusterConfigEntity.java       |    7 +-
 .../entities/ClusterConfigMappingEntity.java    |    6 +
 .../orm/entities/ServiceConfigEntity.java       |    5 +-
 .../server/orm/helpers/dbms/MySqlHelper.java    |   18 +
 .../AmbariLdapAuthenticationProvider.java       |   23 +-
 .../AmbariLdapBindAuthenticator.java            |  233 +-
 .../kerberos/MITKerberosOperationHandler.java   |   17 +-
 .../apache/ambari/server/stack/StackModule.java |  101 +-
 .../server/state/cluster/ClusterImpl.java       |   42 +-
 .../ambari/server/state/host/HostImpl.java      |    2 +-
 .../ambari/server/state/stack/UpgradePack.java  |   12 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |    2 +-
 .../ambari/server/topology/TopologyManager.java |   16 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |    3 -
 .../server/upgrade/SchemaUpgradeHelper.java     |   35 +-
 .../ambari/server/view/ViewExtractor.java       |    2 +-
 .../apache/ambari/server/view/ViewRegistry.java |  381 +-
 ambari-server/src/main/python/ambari-server.py  |  137 +-
 .../python/ambari_server/serverConfiguration.py |    9 +-
 .../main/python/ambari_server/serverUtils.py    |    2 +-
 .../main/python/ambari_server/setupActions.py   |    1 +
 .../main/python/ambari_server/setupMpacks.py    |  175 +-
 .../src/main/python/ambari_server/utils.py      |   12 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    1 +
 .../0.1.0/package/scripts/params.py             |    2 +-
 .../0.1.0/properties/infra-solr-env.sh.j2       |    4 +-
 .../0.1.0/configuration/storm-site.xml          |   84 -
 .../AMBARI_METRICS/0.1.0/metainfo.xml           |    4 -
 .../FLUME/1.4.0.2.0/metrics.json                |   62 -
 .../FLUME/1.4.0.2.0/package/scripts/flume.py    |    1 +
 .../alerts/alert_segment_registration_status.py |   10 +-
 .../package/files/hbaseSmokeVerify.sh           |    2 +-
 .../HBASE/0.96.0.2.0/package/scripts/hbase.py   |   46 +-
 .../HDFS/2.1.0.2.0/kerberos.json                |    2 +-
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |   19 +
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |  497 +-
 .../package/scripts/hive_server_interactive.py  |   26 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |    2 +
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py  |   10 -
 .../logfeeder-custom-logsearch-conf.xml         |   46 +
 .../configuration/logsearch-properties.xml      |   63 +
 .../scripts/logsearch_config_aggregator.py      |   14 +-
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |    1 +
 .../0.5.0/package/scripts/setup_logfeeder.py    |    1 +
 .../templates/HadoopServiceConfig.json.j2       |   14 +-
 .../LOGSEARCH/0.5.0/themes/theme.json           |   87 +-
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |   19 +
 .../OOZIE/4.0.0.2.0/metainfo.xml                |    2 +-
 .../OOZIE/4.2.0.2.3/metainfo.xml                |    2 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   42 +
 .../0.4.0/package/templates/ranger_admin_pam.j2 |   22 +
 .../package/templates/ranger_remote_pam.j2      |   22 +
 .../0.5.0/configuration/ranger-admin-site.xml   |    2 +-
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |    8 +
 .../STORM/1.0.1/configuration/storm-site.xml    |   54 +
 .../0.6.0.2.5/package/scripts/master.py         |   11 +-
 .../main/resources/scripts/Ambaripreupload.py   |    2 +-
 .../src/main/resources/scripts/stack_advisor.py |   11 +-
 .../HDP/2.0.6/configuration/cluster-env.xml     |   10 -
 .../HDP/2.0.6/properties/stack_features.json    |    5 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   50 +-
 .../stacks/HDP/2.1/services/stack_advisor.py    |   20 +-
 .../HDP/2.2/services/HIVE/themes/theme.json     |  107 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |    7 -
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 1042 --
 .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml     | 1050 --
 .../services/HIVE/configuration/hive-env.xml    |   35 +
 .../services/OOZIE/configuration/oozie-env.xml  |   33 +
 .../stacks/HDP/2.3/services/OOZIE/metainfo.xml  |    6 +
 .../HDP/2.3/services/OOZIE/themes/theme.json    |  116 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |    4 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |    4 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |    4 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |    4 +-
 .../stacks/HDP/2.5/services/HDFS/kerberos.json  |    2 +-
 .../HIVE/configuration/hive-interactive-env.xml |   10 +
 .../HIVE/configuration/hivemetastore-site.xml   |    8 +
 .../hiveserver2-interactive-site.xml            |    8 +
 .../HIVE/configuration/hiveserver2-site.xml     |    8 +
 .../stacks/HDP/2.5/services/OOZIE/metainfo.xml  |    6 +
 .../HDP/2.5/services/OOZIE/themes/theme.json    |  116 +
 .../stacks/HDP/2.5/services/SPARK/kerberos.json |   60 +-
 .../stacks/HDP/2.5/services/stack_advisor.py    |   52 +-
 .../HDP/2.5/upgrades/host-ordered-upgrade.xml   |   17 +-
 .../services/ATLAS/themes/theme_version_2.json  |   28 +-
 .../stacks/HDP/2.6/services/SPARK/kerberos.json |   62 +-
 .../HDP/2.6/services/ZEPPELIN/metainfo.xml      |    2 +-
 .../stacks/HDP/2.6/services/stack_advisor.py    |    2 +-
 .../PERF/1.0/configuration/cluster-env.xml      |    6 +-
 .../GRUMPY/configuration/grumpy-site.xml        |   36 +
 .../PERF/1.0/services/GRUMPY/metainfo.xml       |   57 +
 .../services/GRUMPY/package/scripts/dwarf.py    |   38 +
 .../GRUMPY/package/scripts/service_check.py     |   30 +
 .../PERF/1.0/services/GRUMPY/themes/theme.json  |   65 +
 .../services/HAPPY/configuration/happy-site.xml |    2 +-
 .../stacks/PERF/1.0/services/HBASE/alerts.json  |  127 +
 .../services/HBASE/configuration/hbase-env.xml  |  292 +
 .../HBASE/configuration/hbase-log4j.xml         |  146 +
 .../configuration/hbase-logsearch-conf.xml      |  111 +
 .../HBASE/configuration/hbase-policy.xml        |   53 +
 .../services/HBASE/configuration/hbase-site.xml |  573 ++
 .../HBASE/configuration/ranger-hbase-audit.xml  |  122 +
 .../ranger-hbase-policymgr-ssl.xml              |   66 +
 .../configuration/ranger-hbase-security.xml     |   68 +
 .../PERF/1.0/services/HBASE/kerberos.json       |  159 +
 .../stacks/PERF/1.0/services/HBASE/metainfo.xml |  196 +
 .../stacks/PERF/1.0/services/HBASE/metrics.json | 9374 ++++++++++++++++++
 .../HBASE/package/scripts/hbase_client.py       |   38 +
 .../HBASE/package/scripts/hbase_master.py       |   41 +
 .../HBASE/package/scripts/hbase_regionserver.py |   41 +
 .../package/scripts/phoenix_queryserver.py      |   38 +
 .../HBASE/package/scripts/service_check.py      |   30 +
 .../services/HBASE/quicklinks/quicklinks.json   |   97 +
 .../PERF/1.0/services/HBASE/themes/theme.json   |  411 +
 .../stacks/PERF/1.0/services/HBASE/widgets.json |  510 +
 .../stacks/PERF/1.0/services/HDFS/alerts.json   | 1786 ++++
 .../services/HDFS/configuration/core-site.xml   |  225 +
 .../services/HDFS/configuration/hadoop-env.xml  |  419 +
 .../hadoop-metrics2.properties.xml              |  125 +
 .../HDFS/configuration/hadoop-policy.xml        |  130 +
 .../services/HDFS/configuration/hdfs-log4j.xml  |  225 +
 .../HDFS/configuration/hdfs-logsearch-conf.xml  |  248 +
 .../services/HDFS/configuration/hdfs-site.xml   |  633 ++
 .../HDFS/configuration/ranger-hdfs-audit.xml    |  124 +
 .../ranger-hdfs-plugin-properties.xml           |   88 +
 .../configuration/ranger-hdfs-policymgr-ssl.xml |   67 +
 .../HDFS/configuration/ranger-hdfs-security.xml |   65 +
 .../services/HDFS/configuration/ssl-client.xml  |   70 +
 .../services/HDFS/configuration/ssl-server.xml  |   80 +
 .../stacks/PERF/1.0/services/HDFS/kerberos.json |  246 +
 .../stacks/PERF/1.0/services/HDFS/metainfo.xml  |  265 +
 .../stacks/PERF/1.0/services/HDFS/metrics.json  | 7905 +++++++++++++++
 .../package/alerts/alert_checkpoint_time.py     |   69 +
 .../alerts/alert_datanode_unmounted_data_dir.py |   74 +
 .../package/alerts/alert_ha_namenode_health.py  |   75 +
 .../package/alerts/alert_metrics_deviation.py   |   85 +
 .../package/alerts/alert_upgrade_finalized.py   |   74 +
 .../services/HDFS/package/scripts/datanode.py   |   38 +
 .../HDFS/package/scripts/hdfs_client.py         |   38 +
 .../HDFS/package/scripts/journalnode.py         |   38 +
 .../services/HDFS/package/scripts/namenode.py   |   54 +
 .../services/HDFS/package/scripts/nfsgateway.py |   38 +
 .../HDFS/package/scripts/service_check.py       |   30 +
 .../services/HDFS/package/scripts/snamenode.py  |   38 +
 .../services/HDFS/package/scripts/zkfc_slave.py |   38 +
 .../services/HDFS/quicklinks/quicklinks.json    |   76 +
 .../PERF/1.0/services/HDFS/themes/theme.json    |  179 +
 .../stacks/PERF/1.0/services/HDFS/widgets.json  |  649 ++
 .../SLEEPY/configuration/sleepy-site.xml        |   36 +
 .../PERF/1.0/services/SLEEPY/metainfo.xml       |   57 +
 .../services/SLEEPY/package/scripts/dwarf.py    |   38 +
 .../SLEEPY/package/scripts/service_check.py     |   30 +
 .../PERF/1.0/services/SLEEPY/themes/theme.json  |   65 +
 .../services/SNOW/configuration/snow-site.xml   |    2 +-
 .../PERF/1.0/services/YARN/YARN_metrics.json    | 3486 +++++++
 .../PERF/1.0/services/YARN/YARN_widgets.json    |  611 ++
 .../stacks/PERF/1.0/services/YARN/alerts.json   |  392 +
 .../YARN/configuration-mapred/mapred-env.xml    |   50 +
 .../YARN/configuration-mapred/mapred-site.xml   |  134 +
 .../YARN/configuration/capacity-scheduler.xml   |   69 +
 .../YARN/configuration/ranger-yarn-audit.xml    |  121 +
 .../ranger-yarn-plugin-properties.xml           |   82 +
 .../configuration/ranger-yarn-policymgr-ssl.xml |   66 +
 .../YARN/configuration/ranger-yarn-security.xml |   58 +
 .../services/YARN/configuration/yarn-env.xml    |  201 +
 .../services/YARN/configuration/yarn-log4j.xml  |  103 +
 .../services/YARN/configuration/yarn-site.xml   |  796 ++
 .../stacks/PERF/1.0/services/YARN/kerberos.json |  279 +
 .../stacks/PERF/1.0/services/YARN/metainfo.xml  |  352 +
 .../package/alerts/alert_nodemanager_health.py  |   67 +
 .../alerts/alert_nodemanagers_summary.py        |   68 +
 .../scripts/application_timeline_server.py      |   38 +
 .../YARN/package/scripts/historyserver.py       |   38 +
 .../package/scripts/mapred_service_check.py     |   30 +
 .../YARN/package/scripts/mapreduce2_client.py   |   38 +
 .../YARN/package/scripts/nodemanager.py         |   38 +
 .../YARN/package/scripts/resourcemanager.py     |   44 +
 .../YARN/package/scripts/service_check.py       |   30 +
 .../YARN/package/scripts/yarn_client.py         |   38 +
 .../YARN/quicklinks-mapred/quicklinks.json      |   76 +
 .../services/YARN/quicklinks/quicklinks.json    |   76 +
 .../1.0/services/YARN/themes-mapred/theme.json  |  132 +
 .../PERF/1.0/services/YARN/themes/theme.json    |  250 +
 .../PERF/1.0/services/ZOOKEEPER/metainfo.xml    |   50 +
 .../ZOOKEEPER/package/scripts/service_check.py  |   30 +
 .../package/scripts/zookeeper_client.py         |   38 +
 .../package/scripts/zookeeper_server.py         |   38 +
 .../src/main/resources/stacks/stack_advisor.py  |  200 +-
 .../src/main/resources/upgrade-pack.xsd         |   10 +-
 .../StackDefinedPropertyProviderTest.java       |    2 +
 .../RestMetricsPropertyProviderTest.java        |    2 +
 .../AlertMaintenanceModeListenerTest.java       |    2 +-
 .../AmbariLdapBindAuthenticatorTest.java        |  226 +-
 .../server/state/stack/UpgradePackTest.java     |   22 +
 .../svccomphost/ServiceComponentHostTest.java   |   30 +-
 .../ClusterDeployWithStartOnlyTest.java         |    2 +-
 ...InstallWithoutStartOnComponentLevelTest.java |    2 +-
 .../ClusterInstallWithoutStartTest.java         |    2 +-
 .../ambari/server/view/ViewRegistryTest.java    |    2 +
 ambari-server/src/test/python/TestMpacks.py     |  234 +-
 .../test_alert_segment_registration_status.py   |    6 +-
 .../grafana-dashboards/grafana-hdfs-users.json  |  270 +
 .../dashboards/service-metrics/STORM.txt        |    7 +
 .../stacks/2.0.6/HBASE/test_hbase_client.py     |   14 -
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |   21 -
 .../2.0.6/HBASE/test_hbase_regionserver.py      |   28 -
 .../2.0.6/HBASE/test_phoenix_queryserver.py     |   16 -
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |  147 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |  311 +-
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |    4 -
 .../stacks/2.0.6/common/test_stack_advisor.py   |   34 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |  170 +-
 .../stacks/2.1/common/test_stack_advisor.py     |    5 -
 .../stacks/2.2/common/test_stack_advisor.py     |   20 +-
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py      |    3 +
 .../stacks/2.5/HIVE/test_hive_server_int.py     |  112 +
 .../stacks/2.5/RANGER/test_ranger_admin.py      |   14 +
 .../stacks/2.5/RANGER/test_ranger_tagsync.py    |    7 +
 .../stacks/2.5/RANGER/test_ranger_usersync.py   |    7 +
 .../stacks/2.5/RANGER_KMS/test_kms_server.py    |   14 +
 .../stacks/2.5/common/test_stack_advisor.py     |   79 +-
 .../test/python/stacks/2.5/configs/hsi_ha.json  | 1254 +++
 .../stacks/2.6/common/test_stack_advisor.py     |    4 +-
 .../test/python/stacks/test_stack_adviser.py    |  239 -
 .../python/uninstall/common-services/SERVICEA   |    1 +
 .../python/uninstall/common-services/SERVICEB   |    1 +
 .../test/python/uninstall/dashboards/SERVICEA   |    1 +
 .../test/python/uninstall/dashboards/SERVICEB   |    1 +
 .../uninstall/dashboards/files/README.txt       |   17 +
 .../python/uninstall/dashboards/files/STORM.txt |    1 +
 .../uninstall/dashboards/files/metainfo.xml     |    1 +
 .../test/python/uninstall/extensions/SERVICEA   |    1 +
 .../test/python/uninstall/extensions/SERVICEB   |    1 +
 .../test/python/uninstall/stacks/2.0/SERVICEA   |    1 +
 .../test/python/uninstall/stacks/2.0/SERVICEB   |    1 +
 .../uninstall/stacks/2.0/files/README.txt       |   17 +
 .../uninstall/stacks/2.0/files/metainfo1.xml    |    1 +
 .../uninstall/stacks/2.0/files/metainfo2.xml    |    1 +
 .../GANGLIA/upgrades/HDP/rolling-upgrade.xml    |   41 +
 ambari-web/app/app.js                           |    4 -
 ambari-web/app/assets/test/tests.js             |    9 +-
 .../hawq/activateStandby/step2_controller.js    |    2 +-
 .../hawq/addStandby/step3_controller.js         |    3 +-
 .../journalNode/step2_controller.js             |    3 +-
 .../nameNode/step3_controller.js                |    3 +-
 .../resourceManager/step3_controller.js         |    2 +-
 .../main/admin/kerberos/step4_controller.js     |   27 +-
 .../main/admin/kerberos/wizard_controller.js    |   15 +
 .../main/admin/service_auto_start.js            |  330 +-
 .../add_alert_definition/step1_controller.js    |   41 +-
 .../alert_definitions_actions_controller.js     |    4 +-
 .../alerts/definition_configs_controller.js     |   40 +-
 .../app/controllers/main/charts/heatmap.js      |    6 +-
 ambari-web/app/controllers/main/host/details.js |    2 +-
 .../controllers/main/service/add_controller.js  |   17 +-
 ambari-web/app/controllers/wizard.js            |   45 +-
 .../app/controllers/wizard/step6_controller.js  |   41 +
 .../app/controllers/wizard/step7_controller.js  |    2 +-
 .../app/controllers/wizard/step8_controller.js  |    2 +-
 ambari-web/app/data/HDP2.2/hive_properties.js   |  119 -
 ambari-web/app/data/HDP2.2/site_properties.js   |  275 -
 ambari-web/app/data/HDP2.2/tez_properties.js    |   43 -
 ambari-web/app/data/HDP2.2/yarn_properties.js   |   54 -
 .../HDP2.3/hawq_activate_standby_properties.js  |   43 -
 .../app/data/HDP2.3/hawq_ha_properties.js       |   43 -
 ambari-web/app/data/HDP2.3/site_properties.js   |  370 -
 ambari-web/app/data/HDP2/alert_notification.js  |  145 -
 .../app/data/HDP2/gluster_fs_properties.js      |   94 -
 ambari-web/app/data/HDP2/ha_properties.js       |  538 -
 .../data/HDP2/kerberos_descriptor_properties.js |   35 -
 ambari-web/app/data/HDP2/kerberos_identities.js |  129 -
 .../data/HDP2/move_journal_node_properties.js   |   42 -
 ambari-web/app/data/HDP2/rm_ha_properties.js    |  206 -
 ambari-web/app/data/HDP2/secure_mapping.js      | 1004 --
 ambari-web/app/data/HDP2/site_properties.js     | 2558 -----
 ambari-web/app/data/HDP2/ui_properties.js       |   49 -
 .../app/data/configs/alert_notification.js      |  145 +
 .../configs/services/accumulo_properties.js     |  116 +
 .../configs/services/ambari_infra_properties.js |  167 +
 .../services/ambari_metrics_properties.js       |  188 +
 .../data/configs/services/falcon_properties.js  |  302 +
 .../data/configs/services/flume_properties.js   |   38 +
 .../configs/services/glusterfs_properties.js    |   93 +
 .../data/configs/services/hawq_properties.js    |  110 +
 .../data/configs/services/hbase_properties.js   |  124 +
 .../data/configs/services/hdfs_properties.js    |  164 +
 .../data/configs/services/hive_properties.js    |  586 ++
 .../data/configs/services/kafka_properties.js   |   66 +
 .../configs/services/kerberos_properties.js     |  204 +
 .../data/configs/services/knox_properties.js    |   32 +
 .../configs/services/logsearch_properties.js    |  447 +
 .../configs/services/mapreduce2_properties.js   |   45 +
 .../data/configs/services/oozie_properties.js   |   89 +
 .../data/configs/services/ranger_properties.js  |  327 +
 .../data/configs/services/storm_properties.js   |  296 +
 .../app/data/configs/services/tez_properties.js |   92 +
 .../data/configs/services/yarn_properties.js    |  300 +
 .../configs/services/zookeeper_properties.js    |   67 +
 ambari-web/app/data/configs/site_properties.js  |   55 +
 ambari-web/app/data/configs/ui_properties.js    |   49 +
 .../app/data/configs/wizards/ha_properties.js   |  538 +
 .../wizards/hawq_activate_standby_properties.js |   43 +
 .../data/configs/wizards/hawq_ha_properties.js  |   43 +
 .../wizards/kerberos_descriptor_properties.js   |   35 +
 .../data/configs/wizards/kerberos_identities.js |  129 +
 .../wizards/move_journal_node_properties.js     |   42 +
 .../data/configs/wizards/rm_ha_properties.js    |  206 +
 .../app/data/configs/wizards/secure_mapping.js  | 1004 ++
 ambari-web/app/data/custom_stack_map.js         |    2 -
 .../configs/stack_config_properties_mapper.js   |    2 +-
 ambari-web/app/mappers/stack_service_mapper.js  |    2 +-
 ambari-web/app/messages.js                      |   31 +-
 ambari-web/app/mixins.js                        |    1 +
 .../configs/config_recommendation_parser.js     |   20 +-
 .../common/configs/config_recommendations.js    |    2 +-
 .../mixins/common/configs/enhanced_configs.js   |   30 +-
 .../main/service/configs/config_overridable.js  |    1 +
 .../app/mixins/wizard/addSecurityConfigs.js     |    2 +-
 .../app/models/alerts/alert_definition.js       |   54 +
 ambari-web/app/models/service/flume.js          |    8 +
 ambari-web/app/models/stack_service.js          |   13 +-
 ambari-web/app/styles/alerts.less               |  190 +-
 ambari-web/app/styles/application.less          | 3051 +-----
 ambari-web/app/styles/bootstrap_overrides.less  |  294 +
 ambari-web/app/styles/common.less               |   17 -
 ambari-web/app/styles/dashboard.less            |  350 +
 .../app/styles/enhanced_service_dashboard.less  |    2 +
 ambari-web/app/styles/hosts.less                |  494 +
 ambari-web/app/styles/modal_popups.less         |  129 +-
 ambari-web/app/styles/stack_versions.less       |    6 +-
 .../app/styles/theme/bootstrap-ambari.css       |   37 +-
 ambari-web/app/styles/timepicker-overrides.less |   59 +
 ambari-web/app/styles/top-nav.less              |  212 +
 ambari-web/app/styles/wizard.less               |  596 ++
 ambari-web/app/templates/application.hbs        |    6 +-
 .../common/assign_master_components.hbs         |   62 +-
 .../templates/common/configs/overrideWindow.hbs |    2 +-
 .../common/form/check_db_connection.hbs         |   26 +-
 .../templates/common/host_progress_popup.hbs    |  316 +-
 .../common/modal_popups/alerts_popup.hbs        |   80 +-
 .../modal_popups/dependent_configs_list.hbs     |    2 +-
 .../common/modal_popups/select_groups_popup.hbs |    6 +-
 ambari-web/app/templates/experimental.hbs       |    2 +-
 ambari-web/app/templates/installer.hbs          |    2 +-
 ambari-web/app/templates/main.hbs               |    4 +-
 ambari-web/app/templates/main/admin.hbs         |    8 +-
 .../highAvailability/journalNode/step2.hbs      |    2 +-
 .../app/templates/main/admin/kerberos.hbs       |    3 +-
 .../templates/main/admin/serviceAccounts.hbs    |    6 +-
 .../templates/main/admin/service_auto_start.hbs |  124 +-
 .../service_auto_start/component_auto_start.hbs |    2 +-
 .../admin/stack_upgrade/edit_repositories.hbs   |   52 +-
 .../stack_upgrade/stack_upgrade_wizard.hbs      |    6 +-
 .../stack_upgrade/upgrade_history_details.hbs   |    4 +-
 .../main/admin/stack_upgrade/upgrade_task.hbs   |    4 +-
 .../main/alerts/add_alert_definition/step1.hbs  |   30 +-
 .../alerts/add_definition_to_group_popup.hbs    |    2 +-
 .../main/alerts/definition_details.hbs          |    2 +-
 .../main/charts/heatmap/heatmap_host_detail.hbs |   70 +-
 .../main/charts/heatmap/heatmap_rack.hbs        |   37 +-
 .../templates/main/charts/heatmap_dropdown.hbs  |    4 +-
 ambari-web/app/templates/main/dashboard.hbs     |    2 +-
 .../main/dashboard/edit_widget_popup.hbs        |   30 +-
 .../edit_widget_popup_single_threshold.hbs      |   27 +-
 .../main/host/bulk_operation_confirm_popup.hbs  |    2 +-
 ambari-web/app/templates/main/host/configs.hbs  |    4 +-
 .../main/host/details/deleteComponentPopup.hbs  |   20 +-
 .../main/host/details/doDeleteHostPopup.hbs     |   35 +-
 .../details/raiseDeleteComponentErrorPopup.hbs  |   21 +-
 .../app/templates/main/host/host_alerts.hbs     |   10 +-
 ambari-web/app/templates/main/service.hbs       |    2 +-
 .../main/service/all_services_actions.hbs       |   18 +-
 .../main/service/info/heatmap_dropdown.hbs      |    2 +-
 .../app/templates/main/service/info/summary.hbs |    2 +-
 .../templates/main/service/services/flume.hbs   |  196 +-
 ambari-web/app/templates/wizard/step1.hbs       |    2 +-
 .../public_option_disabled_window_body.hbs      |    4 +-
 ambari-web/app/templates/wizard/step3.hbs       |    2 +-
 .../wizard/step3/step3_host_warnings_popup.hbs  |   18 +-
 .../wizard/step9/step9HostTasksLogPopup.hbs     |   87 +-
 ambari-web/app/utils/ajax/ajax.js               |    2 +-
 ambari-web/app/utils/config.js                  |   25 +-
 .../app/utils/configs/config_initializer.js     |   28 +-
 .../mount_points_based_initializer_mixin.js     |  340 +
 ambari-web/app/utils/host_progress_popup.js     |   11 +-
 .../common/assign_master_components_view.js     |    6 +-
 .../configs/service_configs_by_category_view.js |    2 +-
 ambari-web/app/views/common/controls_view.js    |   16 +-
 .../views/common/helpers/status_icon_view.js    |    2 +-
 ambari-web/app/views/common/table_view.js       |    6 +-
 .../app/views/main/admin/service_auto_start.js  |   55 +-
 .../service_auto_start/component_auto_start.js  |    8 +-
 .../views/main/admin/stack_and_upgrade_view.js  |    4 +-
 .../alerts/add_alert_definition/step1_view.js   |    3 +
 .../views/main/charts/heatmap/heatmap_rack.js   |   23 +-
 .../views/main/dashboard/widgets/hbase_links.js |    6 +-
 ambari-web/app/views/main/host.js               |    5 +-
 .../views/main/service/reassign/step5_view.js   |    3 +-
 .../app/views/main/service/services/flume.js    |   32 +-
 ambari-web/app/views/wizard/step3_view.js       |    2 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |    4 +-
 ambari-web/brunch-config.js                     |    1 +
 ambari-web/copy-pluggable-stack-resources.sh    |    2 +-
 .../admin/kerberos/step4_controller_test.js     |    4 +
 .../main/admin/service_auto_start_test.js       |  326 +
 .../step1_controller_test.js                    |   33 +-
 .../test/controllers/main/host/details_test.js  |   25 +-
 .../main/service/add_controller_test.js         |   81 +
 .../test/controllers/wizard/step6_test.js       |   85 +
 .../test/data/HDP2.2/site_properties_test.js    |   76 -
 .../test/data/HDP2.3/site_properties_test.js    |   77 -
 .../test/data/HDP2/secure_mapping_test.js       |   36 -
 .../test/data/HDP2/site_properties_test.js      |   76 -
 .../test/data/configs/site_properties_test.js   |   76 +
 .../data/configs/wizards/secure_mapping_test.js |   36 +
 ambari-web/test/models/service/flume_test.js    |    6 +
 ambari-web/test/utils/ajax/ajax_test.js         |    9 +-
 ambari-web/test/utils/config_test.js            |   46 +-
 .../utils/configs/config_initializer_test.js    |  458 +
 .../component_auto_start_test.js                |   64 +
 .../views/main/admin/service_auto_start_test.js |   83 +
 .../views/main/service/services/flume_test.js   |   17 +-
 .../wizard/step9/hostLogPopupBody_view_test.js  |    2 +-
 ambari-web/vendor/scripts/jquery.typeahead.js   |  300 +
 ambari-web/vendor/styles/bootstrap.css          |   34 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   |  420 +
 contrib/views/ambari-views-package/pom.xml      |  123 +
 .../src/main/package/deb/control/control        |   22 +
 contrib/views/capacity-scheduler/pom.xml        |   18 +
 contrib/views/files/pom.xml                     |   18 +
 contrib/views/hawq/pom.xml                      |   18 +
 contrib/views/hive-next/pom.xml                 |   18 +
 .../resources/ui/hive-web/app/routes/splash.js  |   56 +-
 contrib/views/hive/pom.xml                      |   18 +
 contrib/views/hueambarimigration/pom.xml        |   18 +
 contrib/views/jobs/pom.xml                      |   23 +
 contrib/views/pig/pom.xml                       |   18 +
 contrib/views/pom.xml                           |    5 +
 contrib/views/slider/pom.xml                    |   18 +
 contrib/views/storm/pom.xml                     |   23 +
 contrib/views/tez/pom.xml                       |   18 +
 contrib/views/wfmanager/pom.xml                 |   18 +
 contrib/views/zeppelin/pom.xml                  |   18 +
 .../ambari/view/zeppelin/ZeppelinServlet.java   |  103 +-
 .../src/main/resources/WEB-INF/index.jsp        |   63 -
 docs/pom.xml                                    |   16 +-
 docs/src/site/apt/index.apt                     |    2 +-
 docs/src/site/apt/whats-new.apt                 |    4 +-
 docs/src/site/site.xml                          |    2 +
 502 files changed, 55456 insertions(+), 14321 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1f8b527f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------