Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20f29780 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20f29780 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20f29780 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 20f297803161e7c927446283d1f81043d70055c8 Parents: a851d8f 9b0f631 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Oct 14 09:40:28 2016 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Fri Oct 14 09:40:28 2016 -0400 ---------------------------------------------------------------------- .../resource_management/TestPackageResource.py | 10 +- .../resource_management/core/exceptions.py | 14 +- .../core/providers/package/__init__.py | 67 ++++-- .../core/providers/package/apt.py | 21 +- .../core/providers/package/yumrpm.py | 7 +- .../core/providers/package/zypper.py | 5 + .../python/resource_management/core/shell.py | 5 +- .../libraries/functions/get_user_call_output.py | 4 +- ambari-project/pom.xml | 2 +- .../ambari/server/checks/CheckDescription.java | 6 +- .../server/checks/HiveNotRollingWarning.java | 74 ++++++ .../checks/HiveRollingPortChangeWarning.java | 69 ------ .../AmbariManagementControllerImpl.java | 2 +- .../dao/ServiceComponentDesiredStateDAO.java | 23 +- .../ServiceComponentDesiredStateEntity.java | 24 ++ .../entities/ServiceComponentVersionEntity.java | 159 +++++++++++++ .../apache/ambari/server/stack/RepoUtil.java | 3 +- .../state/repository/VersionDefinitionXml.java | 4 +- .../server/upgrade/SchemaUpgradeHelper.java | 1 + .../server/upgrade/UpgradeCatalog242.java | 124 ++++++++++ .../server/upgrade/UpgradeCatalog250.java | 37 +++ .../server/upgrade/UpgradeCatalog300.java | 1 - .../main/resources/Ambari-DDL-Derby-CREATE.sql | 15 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 16 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 12 + .../resources/Ambari-DDL-Postgres-CREATE.sql | 14 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 12 + .../resources/Ambari-DDL-SQLServer-CREATE.sql | 14 +- .../src/main/resources/META-INF/persistence.xml | 1 + .../HBASE/0.96.0.2.0/package/scripts/upgrade.py | 48 +++- .../0.12.0.2.0/package/scripts/hive_server.py | 27 +-- .../package/scripts/hive_server_upgrade.py | 10 +- .../4.0.0.2.0/package/scripts/oozie_service.py | 2 +- .../OOZIE/4.0.0.2.0/package/scripts/params.py | 2 +- .../stacks/HDP/2.2/upgrades/config-upgrade.xml | 52 ----- .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 24 -- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 47 ++-- .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 37 +-- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 77 ------- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 24 -- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 21 +- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 21 +- .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 26 --- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 24 -- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 21 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 31 --- .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 24 -- .../checks/HiveNotRollingWarningTest.java | 96 ++++++++ .../HiveRollingPortChangeWarningTest.java | 96 -------- .../server/state/ServiceComponentTest.java | 118 ++++++++++ .../server/upgrade/UpgradeCatalog242Test.java | 226 +++++++++++++++++++ .../server/upgrade/UpgradeCatalog250Test.java | 111 +++++++-- .../server/upgrade/UpgradeCatalog300Test.java | 2 - .../stacks/2.0.6/HIVE/test_hive_server.py | 27 ++- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 10 + 55 files changed, 1257 insertions(+), 693 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20f29780/ambari-project/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20f29780/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20f29780/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java ----------------------------------------------------------------------