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/11/13 16:58:08 UTC

[51/51] [abbrv] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-21674

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


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

Branch: refs/heads/branch-feature-AMBARI-21674
Commit: ff8f686f85e7a97f1fee87646686b02b296a5481
Parents: c839dbf 6e706d4
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Nov 13 11:56:52 2017 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Nov 13 11:56:52 2017 -0500

----------------------------------------------------------------------
 ambari-admin/pom.xml                            |    2 +-
 .../app/assets/fonts/Roboto-Regular-webfont.eot |  Bin 0 -> 79547 bytes
 .../app/assets/fonts/Roboto-Regular-webfont.svg | 7606 ++++++++++++++++++
 .../app/assets/fonts/Roboto-Regular-webfont.ttf |  Bin 0 -> 234464 bytes
 .../assets/fonts/Roboto-Regular-webfont.woff    |  Bin 0 -> 105700 bytes
 .../main/resources/ui/admin-web/app/index.html  |   82 +-
 .../app/scripts/controllers/AppCtrl.js          |  177 +
 .../controllers/ClusterInformationCtrl.js       |   65 +
 .../app/scripts/controllers/NavbarCtrl.js       |  106 -
 .../app/scripts/controllers/SideNavCtrl.js      |   68 +
 .../ambariViews/CloneViewInstanceCtrl.js        |  274 +
 .../ambariViews/CreateViewInstanceCtrl.js       |  353 +-
 .../controllers/ambariViews/ViewsListCtrl.js    |  360 +-
 .../controllers/clusters/ExportBlueprintCtrl.js |   58 -
 .../app/scripts/controllers/mainCtrl.js         |  183 -
 .../ui/admin-web/app/scripts/i18n.config.js     |   38 +-
 .../ui/admin-web/app/scripts/routes.js          |  134 +-
 .../ui/admin-web/app/scripts/services/View.js   |   32 +-
 .../app/scripts/theme/bootstrap-ambari.js       |  269 +
 .../app/styles/cluster-information.css          |   59 +
 .../resources/ui/admin-web/app/styles/main.css  |  566 +-
 .../app/styles/theme/bootstrap-ambari.css       | 1518 ++++
 .../ui/admin-web/app/styles/top-nav.css         |  197 +
 .../resources/ui/admin-web/app/styles/views.css |   49 +
 .../app/views/ambariViews/listTable.html        |  110 -
 .../app/views/ambariViews/listUrls.html         |  117 -
 .../app/views/ambariViews/modals/create.html    |  238 +-
 .../app/views/ambariViews/modals/edit.html      |  138 -
 .../app/views/ambariViews/viewsList.html        |  134 +
 .../admin-web/app/views/clusterInformation.html |   66 +
 .../app/views/clusters/exportBlueprint.html     |   40 -
 .../ui/admin-web/app/views/groups/list.html     |    7 +-
 .../ui/admin-web/app/views/leftNavbar.html      |  126 -
 .../resources/ui/admin-web/app/views/main.html  |   96 -
 .../app/views/remoteClusters/list.html          |    6 +-
 .../ui/admin-web/app/views/sideNav.html         |  113 +
 .../admin-web/app/views/stackVersions/list.html |    8 +-
 .../ui/admin-web/app/views/urls/create.html     |    4 +-
 .../ui/admin-web/app/views/urls/edit.html       |    4 +-
 .../ui/admin-web/app/views/users/list.html      |    7 +-
 .../src/main/resources/ui/admin-web/bower.json  |    2 +-
 .../src/main/resources/ui/admin-web/gulpfile.js |   10 +-
 .../main/resources/ui/admin-web/package.json    |    6 +-
 .../test/unit/controllers/AppCtrl_test.js       |  211 +
 .../unit/controllers/CloneViewInstanceCtrl.js   |  135 +
 .../unit/controllers/CreateViewInstanceCtrl.js  |  135 -
 .../test/unit/controllers/mainCtrl_test.js      |  215 -
 .../test/unit/services/Utility_test.js          |    3 +-
 .../src/main/python/ambari_agent/AmbariAgent.py |    3 -
 .../python/ambari_agent/alerts/base_alert.py    |    2 +-
 .../libraries/functions/__init__.py             |    1 -
 .../libraries/functions/conf_select.py          |   58 +
 .../libraries/functions/curl_krb_request.py     |   22 +-
 .../libraries/functions/get_lzo_packages.py     |   50 -
 .../libraries/functions/package_conditions.py   |   14 +-
 .../libraries/functions/stack_select.py         |    3 +-
 ambari-logsearch/README.md                      |   26 +-
 .../ambari-logsearch-logfeeder/README.md        |   17 +-
 .../ambari-logsearch-logfeeder/pom.xml          |    6 +-
 .../src/main/resources/log-samples/.gitignore   |    4 +
 .../log-samples/logs/service_sample.txt         |    3 +
 .../log-samples/shipper-conf/global.config.json |   10 +
 .../shipper-conf/input.config-sample.json       |   31 +
 .../shipper-conf/output.config-sample.json      |   34 +
 .../src/main/resources/log4j.xml                |    4 +-
 .../src/main/resources/logfeeder.properties     |   31 +-
 .../ambari-logsearch-server/.gitignore          |    1 +
 .../ambari-logsearch-server/README.md           |   44 +-
 .../ambari-logsearch-server/pom.xml             |    2 +-
 ambari-logsearch/ambari-logsearch-server/run.sh |    2 +-
 .../ambari/logsearch/conf/AuthPropsConfig.java  |   18 +
 .../ambari/logsearch/conf/SecurityConfig.java   |    6 +-
 .../LogsearchAuthenticationEntryPoint.java      |    2 +-
 .../src/main/resources/logsearch.properties     |   54 +-
 .../ambari-logsearch-web/src/app/app.module.ts  |    8 +-
 .../src/app/classes/filtering.ts                |  355 +-
 .../src/app/classes/models/app-state.ts         |    6 +-
 .../src/app/classes/models/node-item.ts         |   30 +
 .../src/app/classes/models/node.ts              |   30 -
 .../src/app/classes/models/store.ts             |    6 +-
 .../src/app/classes/models/tab.ts               |   12 +-
 .../action-menu/action-menu.component.html      |   20 +
 .../action-menu/action-menu.component.less      |   27 +
 .../action-menu/action-menu.component.spec.ts   |   47 +
 .../action-menu/action-menu.component.ts        |  105 +
 .../src/app/components/app.component.html       |    4 +-
 .../src/app/components/app.component.less       |    5 +-
 .../src/app/components/app.component.ts         |    6 +-
 .../dropdown-button.component.html              |    4 +-
 .../dropdown-button.component.spec.ts           |    2 -
 .../dropdown-button.component.ts                |   55 +-
 .../dropdown-list/dropdown-list.component.html  |    2 +-
 .../dropdown-list.component.spec.ts             |    6 +-
 .../filter-button.component.spec.ts             |    2 -
 .../filter-button/filter-button.component.ts    |   35 +-
 .../filter-dropdown.component.spec.ts           |   14 +-
 .../filter-dropdown.component.ts                |   22 +-
 .../filters-panel/filters-panel.component.html  |    6 +-
 .../filters-panel.component.spec.ts             |    6 +-
 .../filters-panel/filters-panel.component.ts    |   18 +-
 .../log-context/log-context.component.spec.ts   |    4 +-
 .../log-level/log-level.component.html          |   18 +
 .../log-level/log-level.component.spec.ts       |   73 +
 .../components/log-level/log-level.component.ts |   52 +
 .../log-message/log-message.component.html      |   24 +
 .../log-message/log-message.component.less      |   69 +
 .../log-message/log-message.component.spec.ts   |   64 +
 .../log-message/log-message.component.ts        |  129 +
 .../logs-container.component.html               |   58 +-
 .../logs-container.component.less               |    3 +
 .../logs-container.component.spec.ts            |    2 -
 .../logs-container/logs-container.component.ts  |   26 +-
 .../logs-list/logs-list.component.html          |   95 +-
 .../logs-list/logs-list.component.less          |  130 +-
 .../logs-list/logs-list.component.spec.ts       |   21 +-
 .../components/logs-list/logs-list.component.ts |   10 +-
 .../main-container.component.html               |    2 +-
 .../menu-button/menu-button.component.html      |   17 +-
 .../menu-button/menu-button.component.less      |   22 +-
 .../menu-button/menu-button.component.spec.ts   |    2 -
 .../menu-button/menu-button.component.ts        |  146 +-
 .../src/app/components/mixins.less              |    5 +
 .../pagination-controls.component.html          |   15 +-
 .../pagination-controls.component.spec.ts       |  101 +
 .../pagination-controls.component.ts            |   76 +-
 .../pagination/pagination.component.html        |    2 +-
 .../pagination/pagination.component.spec.ts     |    9 +-
 .../pagination/pagination.component.ts          |   10 +-
 .../search-box/search-box.component.ts          |   12 +-
 .../time-range-picker.component.html            |    3 +-
 .../time-range-picker.component.spec.ts         |   29 +-
 .../time-range-picker.component.ts              |   47 +-
 .../timezone-picker.component.spec.ts           |    2 -
 .../components/top-menu/top-menu.component.html |   10 +-
 .../components/top-menu/top-menu.component.less |    1 +
 .../components/top-menu/top-menu.component.ts   |   83 +-
 .../src/app/components/variables.less           |    3 +
 .../services/component-actions.service.spec.ts  |    2 -
 .../app/services/component-actions.service.ts   |   24 +-
 .../component-generator.service.spec.ts         |    2 -
 .../src/app/services/filtering.service.spec.ts  |   97 -
 .../src/app/services/filtering.service.ts       |  253 -
 .../app/services/logs-container.service.spec.ts |   31 +-
 .../src/app/services/logs-container.service.ts  |  678 +-
 .../src/app/services/utils.service.spec.ts      |  285 +-
 .../src/app/services/utils.service.ts           |   65 +-
 .../ambari-logsearch-web/webpack.config.js      |   15 +-
 ambari-logsearch/docker/Dockerfile              |    6 -
 ambari-logsearch/docker/docker-compose.yml      |    4 +-
 ambari-logsearch/docker/logsearch-docker.sh     |    1 +
 .../docs/security/kerberos/kerberos_service.md  |   22 +-
 ambari-server/pom.xml                           |   12 +
 .../ambari/server/agent/ExecutionCommand.java   |   34 +-
 .../ambari/server/agent/HeartbeatProcessor.java |   72 +-
 .../ambari/server/checks/CheckDescription.java  |    9 +
 .../apache/ambari/server/checks/LZOCheck.java   |   76 +
 .../AmbariCustomCommandExecutionHelper.java     |   23 +-
 .../AmbariManagementControllerImpl.java         |   60 +-
 .../controller/DeleteIdentityHandler.java       |    3 +-
 .../server/controller/KerberosHelper.java       |   21 +-
 .../server/controller/KerberosHelperImpl.java   |  138 +-
 .../ClusterStackVersionResourceProvider.java    |   41 +-
 .../HostKerberosIdentityResourceProvider.java   |   16 +-
 .../HostStackVersionResourceProvider.java       |    2 +-
 .../internal/UpgradeResourceProvider.java       |   12 +-
 .../ServiceComponentUninstalledEvent.java       |   11 +-
 .../server/orm/dao/KerberosKeytabDAO.java       |  110 +
 .../server/orm/dao/KerberosPrincipalDAO.java    |    7 +
 .../orm/dao/KerberosPrincipalHostDAO.java       |   40 +-
 .../orm/entities/KerberosKeytabEntity.java      |   86 +
 .../entities/KerberosPrincipalHostEntity.java   |   57 +-
 .../entities/KerberosPrincipalHostEntityPK.java |   19 +-
 .../serveraction/ServerActionExecutor.java      |  147 +-
 .../kerberos/ADKerberosOperationHandler.java    |   22 +-
 .../AbstractPrepareKerberosServerAction.java    |   29 +-
 .../kerberos/CleanupServerAction.java           |   14 +-
 .../server/serveraction/kerberos/Component.java |   13 +-
 .../ConfigureAmbariIdentitiesServerAction.java  |   31 +-
 .../kerberos/CreateKeytabFilesServerAction.java |   65 +-
 .../kerberos/CreatePrincipalsServerAction.java  |   52 +-
 .../kerberos/DestroyPrincipalsServerAction.java |    3 +-
 .../kerberos/IPAKerberosOperationHandler.java   | 1067 +--
 .../kerberos/KDCKerberosOperationHandler.java   |  391 +
 .../kerberos/KerberosIdentityDataFile.java      |    2 -
 .../KerberosIdentityDataFileWriter.java         |    9 +-
 .../kerberos/KerberosOperationHandler.java      |   64 +-
 .../kerberos/KerberosServerAction.java          |   27 +-
 .../kerberos/MITKerberosOperationHandler.java   |  406 +-
 .../PrepareDisableKerberosServerAction.java     |    2 +-
 .../PrepareEnableKerberosServerAction.java      |    2 +-
 .../PrepareKerberosIdentitiesServerAction.java  |    3 +-
 .../stageutils/ResolvedKerberosKeytab.java      |  257 +
 .../upgrades/PreconfigureKerberosAction.java    |   48 +-
 .../ambari/server/stack/ServiceDirectory.java   |   29 +
 .../ambari/server/stack/ServiceModule.java      |    8 +
 .../apache/ambari/server/state/ServiceImpl.java |    2 +-
 .../apache/ambari/server/state/ServiceInfo.java |   14 +
 .../state/repository/ClusterVersionSummary.java |    3 +
 .../state/repository/ServiceVersionSummary.java |   11 +-
 .../state/repository/VersionDefinitionXml.java  |   25 +-
 .../stack/upgrade/RepositoryVersionHelper.java  |   28 +-
 .../svccomphost/ServiceComponentHostImpl.java   |    2 +-
 .../server/upgrade/UpgradeCatalog300.java       |   30 +-
 .../ambari/server/utils/VersionUtils.java       |   46 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   15 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   13 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   13 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   11 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   13 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   13 +-
 .../src/main/resources/META-INF/persistence.xml |    1 +
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |    2 +-
 .../ATLAS/0.7.0.3.0/package/scripts/params.py   |    2 +-
 .../DRUID/0.10.1/package/scripts/druid.py       |    3 +-
 .../DRUID/0.10.1/package/scripts/params.py      |    3 +-
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py  |   11 +-
 .../HBASE/2.0.0.3.0/service_advisor.py          |   12 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |   30 -
 .../HDFS/2.1.0.2.0/package/scripts/datanode.py  |    1 -
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py      |    7 -
 .../2.1.0.2.0/package/scripts/hdfs_client.py    |    1 -
 .../2.1.0.2.0/package/scripts/install_params.py |    1 +
 .../2.1.0.2.0/package/scripts/journalnode.py    |    1 -
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |    1 -
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml |   30 -
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py      |    7 -
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml |   38 +
 .../HIVE/0.12.0.2.0/metainfo.xml                |    5 -
 .../package/alerts/alert_hive_thrift_port.py    |    3 +-
 .../0.12.0.2.0/package/files/startMetastore.sh  |    4 +-
 .../0.12.0.2.0/package/scripts/hive_service.py  |   10 +-
 .../package/scripts/hive_service_interactive.py |    5 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |    3 +-
 .../0.12.0.2.0/package/scripts/service_check.py |    6 +-
 .../package/scripts/webhcat_service.py          |   19 +-
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml |   10 -
 .../2.1.0.3.0/package/files/startMetastore.sh   |    4 +-
 .../2.1.0.3.0/package/scripts/hive_service.py   |    8 +-
 .../package/scripts/hive_service_interactive.py |    5 +-
 .../2.1.0.3.0/package/scripts/params_linux.py   |   10 +-
 .../2.1.0.3.0/package/scripts/service_check.py  |    6 +-
 .../package/scripts/webhcat_service.py          |   19 +-
 .../1.10.3-10/configuration/kerberos-env.xml    |   36 +-
 .../package/scripts/kerberos_common.py          |    7 +-
 .../1.10.3-30/configuration/kerberos-env.xml    |   36 +-
 .../package/scripts/kerberos_common.py          |    7 +-
 .../LOGSEARCH/0.5.0/metainfo.xml                |    6 +-
 .../1.0.0.2.3/package/scripts/service_check.py  |    3 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |    6 +-
 .../package/scripts/oozie_server_upgrade.py     |    7 +-
 .../4.0.0.2.0/package/scripts/params_linux.py   |    1 +
 .../OOZIE/4.2.0.2.3/metainfo.xml                |    5 -
 .../OOZIE/4.2.0.3.0/metainfo.xml                |    5 -
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py    |    4 -
 .../package/scripts/oozie_server_upgrade.py     |    5 +
 .../scripts/alerts/alert_spark_thrift_port.py   |    8 +-
 .../SPARK/1.2.1/package/scripts/setup_spark.py  |    3 +-
 .../scripts/alerts/alert_spark2_thrift_port.py  |    8 +-
 .../SPARK2/2.0.0/package/scripts/setup_spark.py |    3 +-
 .../SQOOP/1.4.4.2.0/metainfo.xml                |    5 -
 .../1.4.4.2.0/package/scripts/params_linux.py   |    4 +-
 .../SQOOP/1.4.4.3.0/metainfo.xml                |   10 -
 .../1.4.4.3.0/package/scripts/params_linux.py   |    4 +-
 .../0.4.0.2.1/package/scripts/params_linux.py   |    2 +-
 .../TEZ/0.4.0.2.1/package/scripts/tez_client.py |   32 -
 .../TEZ/0.9.0.3.0/configuration/tez-site.xml    |    2 +-
 .../0.9.0.3.0/package/scripts/params_linux.py   |    2 +-
 .../TEZ/0.9.0.3.0/package/scripts/tez_client.py |   26 -
 .../configuration-mapred/mapred-site.xml        |    2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |    2 +-
 .../configuration-mapred/mapred-site.xml        |    2 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |    2 +-
 .../ZEPPELIN/0.7.0/package/scripts/master.py    |   11 +-
 .../custom_actions/scripts/install_packages.py  |   12 +-
 .../custom_actions/scripts/remove_bits.py       |    2 +-
 .../BIGTOP/0.8/services/HDFS/metainfo.xml       |   16 -
 .../0.8/services/HDFS/package/scripts/params.py |    6 +-
 .../BIGTOP/0.8/services/HIVE/metainfo.xml       |    4 -
 .../BIGTOP/0.8/services/OOZIE/metainfo.xml      |    4 -
 .../2.0.6.GlusterFS/services/HIVE/metainfo.xml  |    4 -
 .../2.0.6.GlusterFS/services/OOZIE/metainfo.xml |    4 -
 .../HDP/2.0.6/properties/stack_features.json    |    5 +
 .../HDP/2.0.6/properties/stack_packages.json    |  104 +-
 .../2.1.GlusterFS/services/HIVE/metainfo.xml    |    4 -
 .../2.1.GlusterFS/services/OOZIE/metainfo.xml   |    4 -
 .../stacks/HDP/2.1/services/HIVE/metainfo.xml   |    5 -
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml   |   35 -
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml   |   10 -
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml  |    5 -
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml  |   10 -
 .../2.2/services/TEZ/configuration/tez-site.xml |    4 +-
 .../YARN/configuration-mapred/mapred-site.xml   |    2 +-
 .../2.3.GlusterFS/services/HDFS/metainfo.xml    |   10 -
 .../2.3.GlusterFS/services/HIVE/metainfo.xml    |    9 -
 .../2.3.GlusterFS/services/SQOOP/metainfo.xml   |    9 -
 .../main/resources/stacks/HDP/2.3/metainfo.xml  |    2 +-
 .../stacks/HDP/2.3/services/HDFS/metainfo.xml   |   30 -
 .../stacks/HDP/2.3/services/HIVE/metainfo.xml   |   10 -
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |    1 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |    1 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |    1 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |    1 +
 .../stacks/HDP/2.5/services/FALCON/metainfo.xml |    4 +-
 .../stacks/HDP/2.5/services/HIVE/metainfo.xml   |   10 -
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |    1 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |    1 +
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml |    2 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |   23 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   10 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |    5 +
 .../HDP/3.0/properties/stack_packages.json      |  108 +-
 .../stacks/HDP/3.0/services/HDFS/metainfo.xml   |   30 -
 .../YARN/configuration-mapred/mapred-site.xml   |    2 +-
 .../resources/stacks/PERF/1.0/hdp_urlinfo.json  |   12 +
 .../stacks/PERF/1.0/repos/repoinfo.xml          |    1 +
 .../KERBEROS/configuration/kerberos-env.xml     |   36 +-
 .../src/main/resources/stacks/PERF/1.0/vdf.xml  |   73 +
 .../resources/stacks/PERF/2.0/hdp_urlinfo.json  |   12 +
 .../stacks/PERF/2.0/repos/repoinfo.xml          |    1 +
 .../src/main/resources/stacks/PERF/2.0/vdf.xml  |   74 +
 .../server/agent/TestHeartbeatHandler.java      |    2 +-
 .../ambari/server/checks/LZOCheckTest.java      |  145 +
 .../AmbariManagementControllerImplTest.java     |    2 +-
 .../server/controller/KerberosHelperTest.java   |   12 +-
 ...ClusterStackVersionResourceProviderTest.java |  239 +
 ...ostKerberosIdentityResourceProviderTest.java |   12 +-
 .../internal/UpgradeResourceProviderTest.java   |    8 +
 .../utilities/KerberosIdentityCleanerTest.java  |   10 +-
 .../HostVersionOutOfSyncListenerTest.java       |    2 +-
 .../ADKerberosOperationHandlerTest.java         |  261 +-
 ...AbstractPrepareKerberosServerActionTest.java |   11 +-
 ...nfigureAmbariIdentitiesServerActionTest.java |   11 +-
 .../FinalizeKerberosServerActionTest.java       |    5 +
 .../IPAKerberosOperationHandlerTest.java        |  147 +-
 .../KDCKerberosOperationHandlerTest.java        |  168 +
 .../kerberos/KerberosIdentityDataFileTest.java  |    8 +-
 .../kerberos/KerberosOperationHandlerTest.java  |  152 +-
 .../kerberos/KerberosServerActionTest.java      |  137 +-
 .../MITKerberosOperationHandlerTest.java        |  633 +-
 .../PreconfigureKerberosActionTest.java         |   10 +
 .../ambari/server/stack/ServiceModuleTest.java  |   30 +
 .../server/stack/StackManagerExtensionTest.java |    6 +
 .../state/repository/VersionDefinitionTest.java |   42 +
 .../server/upgrade/UpgradeCatalog300Test.java   |  152 +-
 .../ambari/server/utils/TestVersionUtils.java   |    4 +
 .../python/custom_actions/TestRemoveBits.py     |    5 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |    8 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   18 +-
 .../2.0.6/HIVE/test_hive_service_check.py       |    2 +-
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |    4 -
 .../stacks/2.1/FALCON/test_falcon_server.py     |   10 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |    9 +-
 .../python/stacks/2.1/TEZ/test_tez_client.py    |    2 +-
 .../stacks/2.2/SPARK/test_job_history_server.py |   12 +-
 .../stacks/2.2/SPARK/test_spark_client.py       |   12 +-
 .../stacks/2.2/common/test_conf_select.py       |   14 +-
 .../2.3/MAHOUT/test_mahout_service_check.py     |    4 +-
 .../2.3/SPARK/test_spark_thrift_server.py       |    6 +-
 .../stacks/2.5/HIVE/test_hive_server_int.py     |   15 +-
 .../2.5/configs/ranger-admin-secured.json       |    2 -
 .../stacks/2.5/configs/ranger-kms-secured.json  |    2 -
 .../2.6/configs/ranger-admin-secured.json       |    2 -
 .../PreconfigureActionTest_cluster_config.json  |    4 +-
 ambari-web/app/config.js                        |    1 -
 .../app/controllers/global/update_controller.js |    2 +-
 .../main/admin/kerberos/step1_controller.js     |   52 +-
 .../main/admin/kerberos/step2_controller.js     |    2 +-
 .../main/host/bulk_operations_controller.js     |   14 +-
 ambari-web/app/controllers/main/service/item.js |   13 +-
 .../app/mappers/components_state_mapper.js      |    1 +
 ambari-web/app/messages.js                      |    3 +-
 ambari-web/app/models/client_component.js       |    1 +
 .../app/styles/theme/bootstrap-ambari.css       |   35 +-
 .../admin/kerberos/step1_controller_test.js     |   17 -
 .../admin/kerberos/step2_controller_test.js     |    2 +-
 .../test/controllers/main/service/item_test.js  |   49 +-
 .../vendor/scripts/theme/bootstrap-ambari.js    |    7 -
 .../stacks/ODPi/2.0/services/HIVE/metainfo.xml  |   10 -
 378 files changed, 18632 insertions(+), 7207 deletions(-)
----------------------------------------------------------------------