ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [50/50] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Thu, 06 Apr 2017 18:58:39 GMT
Merge branch 'trunk' into branch-feature-AMBARI-12556


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: f650e351ce50ab2ed7852cf764b6a5074d7873ac
Parents: 70c23bc 01e3727
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Apr 6 14:57:29 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Apr 6 14:57:29 2017 -0400

----------------------------------------------------------------------
 .../main/resources/ui/admin-web/app/index.html  |   4 +-
 ambari-agent/pom.xml                            |  10 +-
 .../ambari_agent/StatusCommandsExecutor.py      | 209 ++++++-------
 .../src/main/python/ambari_agent/main.py        |   5 +-
 .../python/resource_management/TestUtils.py     |  39 +++
 .../python/resource_management/core/sudo.py     |  58 +++-
 .../python/resource_management/core/utils.py    |  56 +++-
 .../libraries/functions/copy_tarball.py         |  24 +-
 .../functions/setup_ranger_plugin_xml.py        |  16 +-
 .../libraries/script/script.py                  |   8 +-
 .../FieldAuditLogRequestQueryConverter.java     |   1 -
 .../TopFieldAuditLogRequestQueryConverter.java  |  54 ++++
 .../logsearch/manager/AuditLogsManager.java     |   3 +-
 .../request/impl/FieldAuditLogRequest.java      |  17 +-
 .../request/impl/TopFieldAuditLogRequest.java   |  40 +++
 .../logsearch/rest/AuditLogsResource.java       |   4 +-
 .../logsearch/rest/UserConfigResource.java      |   2 +-
 .../FieldAuditLogRequestQueryConverterTest.java |   3 +-
 ...pFieldAuditLogRequestQueryConverterTest.java |  61 ++++
 .../ambari-logsearch-web/package.json           |  17 +-
 .../main/webapp/scripts/views/common/Header.js  |   6 +-
 .../server/actionmanager/ActionDBAccessor.java  |  16 +-
 .../actionmanager/ActionDBAccessorImpl.java     |  13 +-
 .../server/actionmanager/ActionScheduler.java   |   2 +-
 .../ambari/server/actionmanager/Stage.java      |  22 +-
 .../server/api/services/AmbariMetaInfo.java     |   6 +
 .../StackAdvisorBlueprintProcessor.java         |   8 +-
 .../ambari/server/checks/CheckDescription.java  |   5 +-
 .../checks/ServiceCheckValidityCheck.java       |  13 +-
 .../server/checks/ServicePresenceCheck.java     |  52 ++-
 .../server/configuration/Configuration.java     |   2 +-
 .../ambari/server/controller/ActionRequest.java |  19 +-
 .../server/controller/ClusterResponse.java      |  17 +-
 .../server/controller/ExecuteActionRequest.java |  16 +-
 .../server/controller/ServiceRequest.java       |  10 +-
 .../server/controller/ShortTaskStatus.java      |  19 +-
 .../ambari/server/controller/UserRequest.java   |   2 +-
 .../BlueprintConfigurationProcessor.java        |   1 +
 .../internal/ClientConfigResourceProvider.java  |  35 ++-
 .../internal/StageResourceProvider.java         |   4 +-
 .../internal/UpgradeItemResourceProvider.java   |  61 ++--
 .../internal/UpgradeResourceProvider.java       |  86 ++---
 .../customactions/ActionDefinitionManager.java  |   4 +-
 .../ambari/server/events/HostsRemovedEvent.java |   2 +-
 .../alerts/AlertStateChangedListener.java       |   2 +-
 .../listeners/upgrade/StackVersionListener.java |   2 +-
 .../apache/ambari/server/orm/dao/StageDAO.java  |  68 ++--
 .../ambari/server/orm/dao/UpgradeDAO.java       |   5 -
 .../server/orm/entities/ClusterEntity.java      |  13 +-
 .../ambari/server/orm/entities/StageEntity.java |  28 +-
 .../server/orm/entities/StageEntityPK.java      |  35 +--
 .../server/orm/entities/UpgradeEntity.java      |  27 +-
 .../server/orm/helpers/dbms/PostgresHelper.java |   2 +-
 .../security/encryption/CredentialProvider.java |   2 +-
 .../serveraction/ServerActionExecutor.java      | 114 +++----
 .../ambari/server/stack/ServiceModule.java      |  18 +-
 .../apache/ambari/server/stack/StackModule.java |   9 +
 .../server/stageplanner/RoleGraphNode.java      |   2 +-
 .../org/apache/ambari/server/state/Cluster.java |  30 +-
 .../apache/ambari/server/state/HostConfig.java  |   4 +-
 .../server/state/ServiceComponentImpl.java      |  13 +-
 .../apache/ambari/server/state/ServiceImpl.java |  10 +-
 .../apache/ambari/server/state/StackInfo.java   |  13 +
 .../ambari/server/state/UpgradeHelper.java      |  48 ---
 .../server/state/cluster/ClusterImpl.java       |  48 +--
 .../AbstractKerberosDescriptorContainer.java    |  27 +-
 .../kerberos/KerberosIdentityDescriptor.java    |  18 ++
 .../state/services/MetricsRetrievalService.java |  29 +-
 .../services/RetryUpgradeActionService.java     |   2 +-
 .../state/stack/StackRoleCommandOrder.java      |   2 +-
 .../state/stack/upgrade/ColocatedGrouping.java  |  80 ++++-
 .../state/stack/upgrade/TaskWrapperBuilder.java |  10 +-
 .../server/topology/BlueprintValidatorImpl.java |   2 +-
 .../apache/ambari/server/view/ViewRegistry.java |  51 ++-
 ambari-server/src/main/python/ambari-server.py  |   4 +-
 .../1.6.1.2.2.0/role_command_order.json         |  14 +
 .../HDP/grafana-llapdaemon-daemons.json         | 313 ++++++++++++++-----
 .../0.1.0/role_command_order.json               |   9 +
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |   5 +
 .../DRUID/0.9.2/package/scripts/superset.py     |   2 +-
 .../FALCON/0.5.0.2.1/role_command_order.json    |   7 +
 .../0.96.0.2.0/package/scripts/params_linux.py  |   9 +-
 .../HBASE/0.96.0.2.0/role_command_order.json    |  10 +
 .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml |   2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |  11 +-
 .../HDFS/2.1.0.2.0/role_command_order.json      |  22 ++
 .../configuration/ranger-hdfs-audit.xml         |   9 +
 .../3.0.0.3.0/package/scripts/params_linux.py   |   9 +-
 .../HDFS/3.0.0.3.0/service_advisor.py           |  27 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |   6 +-
 .../HIVE/0.12.0.2.0/role_command_order.json     |  14 +
 .../configuration/ranger-hive-audit.xml         |   9 +
 .../2.1.0.3.0/package/scripts/params_linux.py   |   6 +-
 .../HIVE/2.1.0.3.0/service_advisor.py           |  25 +-
 .../KAFKA/0.8.1/package/scripts/params.py       |   9 +-
 .../KAFKA/0.8.1/role_command_order.json         |   7 +
 .../KAFKA/0.9.0/role_command_order.json         |   6 +
 .../1.10.3-10/configuration/kerberos-env.xml    |  15 +
 .../1.10.3-10/configuration/krb5-conf.xml       |  43 +--
 .../package/scripts/kerberos_common.py          |   5 +-
 .../1.10.3-10/package/scripts/params.py         |   2 +
 .../1.10.3-10/package/templates/krb5_conf.j2    |  54 ----
 .../KERBEROS/1.10.3-10/properties/krb5_conf.j2  |  60 ++++
 .../0.5.0.2.2/package/scripts/params_linux.py   |  11 +-
 .../KNOX/0.5.0.2.2/role_command_order.json      |   7 +
 .../MAHOUT/1.0.0.2.3/role_command_order.json    |   6 +
 .../OOZIE/4.0.0.2.0/role_command_order.json     |   9 +
 .../PIG/0.12.0.2.0/role_command_order.json      |   6 +
 .../PIG/0.16.1.3.0/configuration/pig-env.xml    |  41 +++
 .../PIG/0.16.1.3.0/configuration/pig-log4j.xml  |  65 ++++
 .../0.16.1.3.0/configuration/pig-properties.xml |  93 ++++++
 .../PIG/0.16.1.3.0/kerberos.json                |  17 +
 .../common-services/PIG/0.16.1.3.0/metainfo.xml | 101 ++++++
 .../PIG/0.16.1.3.0/package/files/pigSmoke.sh    |  18 ++
 .../PIG/0.16.1.3.0/package/scripts/params.py    |  31 ++
 .../0.16.1.3.0/package/scripts/params_linux.py  | 104 ++++++
 .../package/scripts/params_windows.py           |  45 +++
 .../PIG/0.16.1.3.0/package/scripts/pig.py       |  80 +++++
 .../0.16.1.3.0/package/scripts/pig_client.py    |  71 +++++
 .../0.16.1.3.0/package/scripts/service_check.py | 142 +++++++++
 .../PIG/0.16.1.3.0/service_advisor.py           | 171 ++++++++++
 .../RANGER/0.4.0/role_command_order.json        |   8 +
 .../RANGER/0.5.0/role_command_order.json        |   6 +
 .../RANGER/0.6.0/role_command_order.json        |   6 +
 .../0.5.0.2.3/package/scripts/params.py         |  10 +-
 .../0.5.0.2.3/role_command_order.json           |   7 +
 .../SLIDER/0.91.0.3.0/service_advisor.py        |   7 +-
 .../SPARK/1.2.1/role_command_order.json         |   6 +
 .../SPARK/1.5.2/role_command_order.json         |   6 +
 .../SPARK/1.6.0/role_command_order.json         |   8 +
 .../SPARK/2.2.0/service_advisor.py              |   7 +-
 .../SPARK2/2.0.0/role_command_order.json        |   6 +
 .../SQOOP/1.4.4.2.0/role_command_order.json     |   6 +
 .../STORM/0.10.0/role_command_order.json        |   8 +
 .../STORM/0.9.1/package/scripts/params_linux.py |   6 +-
 .../STORM/0.9.1/role_command_order.json         |  13 +
 .../STORM/0.9.3/role_command_order.json         |   7 +
 .../TEZ/0.4.0.2.1/configuration/tez-site.xml    |   2 +-
 .../0.4.0.2.1/package/scripts/params_linux.py   |   2 +
 .../TEZ/0.4.0.2.1/role_command_order.json       |   6 +
 .../TEZ/0.9.0.3.0/service_advisor.py            |   9 +-
 .../configuration-mapred/mapred-site.xml        |   2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |  10 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |  16 +-
 .../YARN/2.1.0.2.0/role_command_order.json      |  21 ++
 .../configuration/ranger-yarn-audit.xml         |   9 +
 .../3.0.0.3.0/package/scripts/params_linux.py   |   9 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py      |  14 +-
 .../YARN/3.0.0.3.0/service_advisor.py           | 259 +++++++--------
 .../0.6.0.2.5/package/scripts/master.py         |  10 +-
 .../ZOOKEEPER/3.4.5/role_command_order.json     |   9 +
 .../ZOOKEEPER/3.4.9/service_advisor.py          |  13 +-
 .../host_scripts/alert_version_select.py        |  10 +-
 .../stacks/BIGTOP/0.8/services/stack_advisor.py |   3 +-
 .../2.0.6/hooks/before-ANY/scripts/params.py    |   1 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   7 +-
 .../stacks/HDP/2.1/services/stack_advisor.py    |   3 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   2 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |   3 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   2 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |   3 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |   6 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |  10 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |  10 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |  16 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  16 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     |  10 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     |  10 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |  11 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |  11 +
 .../services/HDFS/configuration/hadoop-env.xml  |   2 +-
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |   5 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml |  10 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |  16 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  16 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml     |  10 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |  11 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |  11 +
 .../stacks/HDP/2.5/services/stack_advisor.py    | 277 ++++++++--------
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |   6 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |  16 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  16 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml     |  16 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |  11 +
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml |  16 +-
 .../HDP/2.6/services/ACCUMULO/metainfo.xml      |   2 +-
 .../ATLAS/configuration/ranger-atlas-audit.xml  |  33 ++
 .../stacks/HDP/2.6/services/ATLAS/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/DRUID/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/FALCON/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/FLUME/metainfo.xml  |   2 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  |  33 ++
 .../stacks/HDP/2.6/services/HBASE/metainfo.xml  |   2 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   2 +-
 .../HDFS/configuration/ranger-hdfs-audit.xml    |  33 ++
 .../stacks/HDP/2.6/services/HDFS/metainfo.xml   |   2 +-
 .../HIVE/configuration/ranger-hive-audit.xml    |  33 ++
 .../stacks/HDP/2.6/services/HIVE/metainfo.xml   |   2 +-
 .../KAFKA/configuration/ranger-kafka-audit.xml  |  33 ++
 .../stacks/HDP/2.6/services/KAFKA/metainfo.xml  |   2 +-
 .../KNOX/configuration/ranger-knox-audit.xml    |  33 ++
 .../stacks/HDP/2.6/services/KNOX/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/PIG/metainfo.xml    |   2 +-
 .../stacks/HDP/2.6/services/RANGER/metainfo.xml |   2 +-
 .../configuration/ranger-kms-audit.xml          |  33 ++
 .../HDP/2.6/services/RANGER_KMS/metainfo.xml    |   2 +-
 .../stacks/HDP/2.6/services/SLIDER/metainfo.xml |   2 +-
 .../STORM/configuration/ranger-storm-audit.xml  |  33 ++
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |   2 +-
 .../YARN/configuration/ranger-yarn-audit.xml    |  33 ++
 .../stacks/HDP/2.6/services/YARN/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/stack_advisor.py    |  27 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  | 108 +++++++
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  63 +++-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |  43 +++
 .../stacks/HDP/3.0/services/PIG/metainfo.xml    |  27 ++
 .../stacks/HDPWIN/2.1/services/stack_advisor.py |   9 +-
 .../stacks/HDPWIN/2.2/services/stack_advisor.py |   3 +-
 .../KERBEROS/configuration/kerberos-env.xml     |  15 +
 .../KERBEROS/configuration/krb5-conf.xml        |  43 +--
 .../KERBEROS/package/scripts/kerberos_common.py |   5 +-
 .../services/KERBEROS/package/scripts/params.py |   2 +
 .../KERBEROS/package/templates/krb5_conf.j2     |  54 ----
 .../services/KERBEROS/properties/krb5_conf.j2   |  60 ++++
 .../stacks/PERF/1.0/services/stack_advisor.py   |   3 +-
 .../1.0/upgrades/nonrolling-upgrade-2.0.xml     |  10 +
 .../stacks/PERF/1.0/upgrades/upgrade-2.0.xml    |  10 +
 .../src/main/resources/stacks/stack_advisor.py  |  88 +++---
 .../actionmanager/TestActionDBAccessorImpl.java |  27 +-
 .../actionmanager/TestActionScheduler.java      | 139 ++++----
 .../server/api/services/AmbariMetaInfoTest.java |   7 +
 .../StackAdvisorBlueprintProcessorTest.java     |   4 +-
 .../checks/ServiceCheckValidityCheckTest.java   |  20 +-
 .../server/checks/ServicePresenceCheckTest.java |  41 ++-
 .../AmbariManagementControllerTest.java         |   2 +-
 .../BlueprintConfigurationProcessorTest.java    |   5 +-
 .../ClientConfigResourceProviderTest.java       |  12 +-
 .../internal/UpgradeResourceProviderTest.java   |   4 +-
 .../UpgradeSummaryResourceProviderTest.java     |  16 +-
 .../ganglia/GangliaPropertyProviderTest.java    |   6 +-
 .../upgrade/StackVersionListenerTest.java       |   2 +-
 .../ambari/server/orm/dao/RequestDAOTest.java   |  21 +-
 .../ambari/server/orm/dao/UpgradeDAOTest.java   |  21 +-
 .../serveraction/ServerActionExecutorTest.java  |   2 +-
 .../RangerWebAlertConfigActionTest.java         |   2 +-
 .../upgrades/UpgradeActionTest.java             |   2 +-
 .../ambari/server/stack/StackManagerTest.java   |  20 +-
 .../ambari/server/stack/StackModuleTest.java    |  11 +
 .../server/state/ServiceComponentTest.java      |  15 +-
 .../ambari/server/state/UpgradeHelperTest.java  | 188 ++++++++++-
 .../alerts/AlertStateChangedEventTest.java      |   6 +-
 .../state/kerberos/KerberosDescriptorTest.java  |  19 ++
 .../services/MetricsRetrievalServiceTest.java   |  63 ++++
 .../services/RetryUpgradeActionServiceTest.java |  14 +-
 .../stacks/2.0.6/HDFS/test_hdfs_client.py       |  11 +-
 .../python/stacks/2.0.6/configs/default.json    |  24 ++
 .../stacks/2.2/KERBEROS/test_kerberos_client.py |   4 +-
 .../python/stacks/2.2/KERBEROS/use_cases.py     |   5 +-
 .../test_filtering_identity_descriptor.json     |  74 +++++
 .../HDP/2.0.7/services/SYSTEMML/metainfo.xml    |  39 +++
 .../stacks/HDP/2.0.8/services/HIVE/metainfo.xml | 174 +++++++++++
 .../HDP/2.0.8/services/SYSTEMML/metainfo.xml    |  39 +++
 .../upgrades/upgrade_multi_server_tasks.xml     |  88 ++++++
 ambari-web/app/assets/test/tests.js             |   5 +
 ambari-web/app/controllers/application.js       |  10 +-
 ambari-web/app/controllers/experimental.js      |   2 +-
 .../global/errors_handler_controller.js         |   2 +-
 .../global/user_settings_controller.js          |   2 +-
 .../global/wizard_watcher_controller.js         |   2 +-
 ambari-web/app/controllers/installer.js         |  23 +-
 .../main/admin/kerberos/wizard_controller.js    |  18 +-
 .../controllers/main/service/add_controller.js  |  43 +--
 ambari-web/app/controllers/wizard.js            |  62 +++-
 .../app/controllers/wizard/step1_controller.js  |   6 +-
 .../app/controllers/wizard/step3_controller.js  |   5 +-
 .../app/controllers/wizard/step4_controller.js  |   2 +
 .../app/controllers/wizard/step9_controller.js  |   3 +-
 .../wizards/kerberos_descriptor_properties.js   |   5 +
 ambari-web/app/messages.js                      |   8 +-
 ambari-web/app/mixins.js                        |   3 +-
 ambari-web/app/mixins/common/persist.js         | 166 ++++++++++
 ambari-web/app/mixins/common/persist_mixin.js   |  45 ---
 ambari-web/app/mixins/common/userPref.js        | 126 --------
 .../main/host/details/actions/check_host.js     |  86 ++---
 .../app/mixins/wizard/addSecurityConfigs.js     |   4 +-
 ambari-web/app/models/cluster_states.js         |   3 +-
 ambari-web/app/models/repository.js             |  15 +-
 ambari-web/app/routes/add_kerberos_routes.js    |  22 +-
 ambari-web/app/routes/add_service_routes.js     |  16 +-
 ambari-web/app/routes/installer.js              |  25 +-
 ambari-web/app/routes/stack_upgrade_routes.js   |   2 +-
 .../app/styles/theme/bootstrap-ambari.css       |   6 +-
 ambari-web/app/styles/widgets.less              |   1 +
 ambari-web/app/templates/application.hbs        |   6 +-
 .../common/configs/overriddenProperty.hbs       |   4 +-
 .../common/configs/service_config_category.hbs  |  16 +-
 .../common/configs/services_config.hbs          |   6 +-
 ambari-web/app/templates/common/modal_popup.hbs |   8 +-
 ambari-web/app/templates/common/pagination.hbs  |   2 +-
 ambari-web/app/templates/login.hbs              |  12 +-
 ambari-web/app/templates/main.hbs               |   2 +-
 .../stack_upgrade/stack_upgrade_wizard.hbs      |  47 ++-
 ambari-web/app/templates/wizard/step0.hbs       |   9 +-
 ambari-web/app/templates/wizard/step1.hbs       |  70 +++--
 ambari-web/app/templates/wizard/step10.hbs      |   2 +-
 ambari-web/app/templates/wizard/step2.hbs       | 246 ++++++++-------
 ambari-web/app/templates/wizard/step3.hbs       |  63 ++--
 .../step3/step3_host_warning_popup_footer.hbs   |   5 +-
 .../wizard/step3/step3_host_warnings_popup.hbs  |  35 +--
 .../step3/step3_registered_hosts_popup.hbs      |   2 +-
 ambari-web/app/templates/wizard/step4.hbs       |  20 +-
 .../step4/step4_ranger_requirements_popup.hbs   |   2 +-
 ambari-web/app/templates/wizard/step7.hbs       |   4 +-
 ambari-web/app/templates/wizard/step8.hbs       |   8 +-
 ambari-web/app/templates/wizard/step9.hbs       |  46 ++-
 .../wizard/step9/step9HostTasksLogPopup.hbs     |   2 +-
 ambari-web/app/utils/ajax/ajax.js               |  24 +-
 ambari-web/app/utils/helper.js                  |  57 +++-
 ambari-web/app/utils/persist.js                 | 101 ------
 ambari-web/app/views/common/checkbox_view.js    |   3 +-
 .../configs/service_configs_by_category_view.js |   8 +-
 ambari-web/app/views/common/controls_view.js    |   5 +-
 ambari-web/app/views/common/table_view.js       |   2 +-
 ambari-web/app/views/login.js                   |   6 +-
 ambari-web/app/views/main/dashboard/widgets.js  |   2 +-
 .../app/views/main/service/info/summary.js      |   2 +-
 .../main/service/manage_config_groups_view.js   |   2 +-
 ambari-web/app/views/main/service/menu.js       |  40 +--
 .../app/views/main/service/reconfigure.js       |   8 +-
 ambari-web/app/views/main/service/service.js    |  23 +-
 ambari-web/app/views/wizard/step1_view.js       |  13 +-
 ambari-web/app/views/wizard/step2_view.js       |   4 +-
 .../wizard/step3/hostWarningPopupBody_view.js   |   3 +-
 ambari-web/app/views/wizard/step9_view.js       |   1 +
 ambari-web/test/controllers/installer_test.js   |  23 +-
 .../test/controllers/main/service/item_test.js  |   2 +-
 .../test/controllers/wizard/step3_test.js       |  34 --
 ambari-web/test/controllers/wizard_test.js      |  47 ++-
 ambari-web/test/init_test.js                    |  25 ++
 ambari-web/test/mixins/common/persist_test.js   | 125 ++++++++
 ambari-web/test/views/common/table_view_test.js |  14 +-
 .../test/views/main/dashboard/widgets_test.js   |   2 +-
 ambari-web/test/views/main/service/item_test.js | 163 +++++++++-
 .../service/manage_config_groups_view_test.js   | 125 ++++++++
 ambari-web/test/views/main/service/menu_test.js | 210 ++++++++++---
 .../views/main/service/reassign_view_test.js    | 128 ++++++++
 .../test/views/main/service/reconfigure_test.js | 126 ++++++++
 .../test/views/main/service/service_test.js     | 264 ++++++++++++++++
 ambari-web/test/views/wizard/step1_view_test.js |  16 +-
 .../vendor/scripts/theme/bootstrap-ambari.js    |  29 +-
 .../stacks/ODPi/2.0/services/stack_advisor.py   |  21 +-
 .../uploads/parsers/xml/XMLParser.java          |   2 +
 .../uploads/parsers/xml/XMLParser.java          |   2 +
 .../main/resources/ui/app/routes/queries/new.js |   5 +-
 .../src/main/resources/ui/app/styles/app.scss   |  41 ++-
 .../ui/app/styles/bootstrap-overrides.scss      |  25 +-
 .../resources/ui/app/templates/application.hbs  |   2 +-
 .../app/templates/components/alert-message.hbs  |   6 +-
 .../components/top-application-bar.hbs          |   2 +-
 .../src/main/resources/ui/pig-web/app/app.js    |  19 +-
 .../apache/ambari/view/utils/hdfs/HdfsApi.java  |   1 +
 .../ui/app/components/bundle-config.js          |   1 +
 .../resources/ui/app/components/coord-config.js |   1 +
 .../ui/app/components/designer-workspace.js     |   1 +
 .../ui/app/components/flow-designer.js          |   4 +
 .../resources/ui/app/components/job-config.js   |  32 +-
 .../ui/app/components/workflow-credentials.js   |   2 +-
 .../ui/app/domain/cytoscape-flow-renderer.js    |  18 +-
 .../src/main/resources/ui/app/routes/index.js   |   5 +-
 .../ui/app/services/workflow-manager-configs.js |  27 ++
 .../src/main/resources/ui/app/styles/app.less   |   3 -
 .../app/templates/components/bundle-config.hbs  |   2 +-
 .../app/templates/components/coord-config.hbs   |   2 +-
 .../templates/components/credentials-config.hbs |   2 +-
 .../app/templates/components/flow-designer.hbs  |   2 +-
 .../templates/components/transition-config.hbs  |  34 +-
 .../components/workflow-credentials.hbs         |  13 +-
 .../services/workflow-manager-configs-test.js   |  28 ++
 dev-support/test-patch.sh                       |  88 ++----
 docs/pom.xml                                    |   3 +-
 docs/src/site/apt/index.apt                     |   2 +-
 docs/src/site/apt/whats-new.apt                 |  24 +-
 docs/src/site/site.xml                          |   2 +
 385 files changed, 7316 insertions(+), 2689 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/ambari/blob/f650e351/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f650e351/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f650e351/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
index 740ecea,8e8bed3..2d589ed
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
@@@ -29,9 -30,9 +30,10 @@@ import java.util.Map
  
  import org.apache.ambari.server.AmbariException;
  import org.apache.ambari.server.H2DatabaseCleaner;
+ import org.apache.ambari.server.actionmanager.HostRoleStatus;
  import org.apache.ambari.server.api.services.AmbariMetaInfo;
  import org.apache.ambari.server.controller.ServiceComponentResponse;
 +import org.apache.ambari.server.events.listeners.upgrade.StackVersionListener;
  import org.apache.ambari.server.orm.GuiceJpaInitializer;
  import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
  import org.apache.ambari.server.orm.OrmTestHelper;

http://git-wip-us.apache.org/repos/asf/ambari/blob/f650e351/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------


Mime
View raw message