ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [21/21] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-21450
Date Thu, 17 Aug 2017 18:59:10 GMT
Merge branch 'branch-2.6' into branch-feature-AMBARI-21450


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

Branch: refs/heads/branch-2.6
Commit: 99484dccd21395cd1dc0ce0cf71ccebce83b0c86
Parents: ba15d80 4cc8976
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Aug 17 14:30:54 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Aug 17 14:30:54 2017 -0400

----------------------------------------------------------------------
 .../python/ambari_agent/alerts/base_alert.py    |   15 +-
 .../python/ambari_agent/alerts/web_alert.py     |    4 +
 .../src/test/python/ambari_agent/TestAlerts.py  |   19 +-
 .../resource_management/TestPackagesAnalyzer.py |  141 ++
 .../libraries/functions/packages_analyzer.py    |  356 +++++
 .../libraries/script/script.py                  |    1 +
 ambari-project/pom.xml                          |    1 +
 ambari-server/pom.xml                           |    2 +-
 .../apache/ambari/server/orm/DBAccessor.java    |   36 +-
 .../ambari/server/orm/DBAccessorImpl.java       |   90 +-
 .../server/orm/helpers/dbms/DbmsHelper.java     |   20 -
 .../orm/helpers/dbms/GenericDbmsHelper.java     |   11 -
 .../server/orm/helpers/dbms/H2Helper.java       |   13 -
 .../server/orm/helpers/dbms/MySqlHelper.java    |   13 -
 .../server/orm/helpers/dbms/OracleHelper.java   |   12 -
 .../server/orm/helpers/dbms/PostgresHelper.java |   12 -
 .../ambari/server/state/alert/AlertUri.java     |   16 +
 .../ambari/server/topology/AmbariContext.java   |   39 +-
 .../server/upgrade/UpgradeCatalog260.java       |  169 +--
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |    8 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    5 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |    5 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |    2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |    5 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   12 +-
 .../STORM/1.1.0/configuration/storm-env.xml     |   54 +
 .../STORM/1.1.0/configuration/storm-site.xml    |   48 -
 .../2.1.0.2.0/package/scripts/params_linux.py   |    5 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |   14 +-
 .../4.2.5/upgrades/config-upgrade.xml           |    4 +
 .../upgrades/nonrolling-upgrade-to-hdp-2.6.xml  |    4 +
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |    7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |    4 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |    1 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |    7 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |    4 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |    2 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |    7 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |    4 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |    1 +
 .../stacks/HDP/2.6/services/stack_advisor.py    |   87 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |    6 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |    4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |    1 +
 .../src/main/resources/stacks/stack_advisor.py  |   18 +
 .../ambari/server/orm/DBAccessorImplTest.java   |   88 ++
 .../apache/ambari/server/orm/db/DDLTests.java   |   39 +-
 .../server/testing/DBInconsistencyTests.java    |   20 +-
 .../server/topology/AmbariContextTest.java      |   92 +-
 .../server/upgrade/UpgradeCatalog260Test.java   |  468 +++++++
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |  160 ++-
 .../default_yarn_include_file_dont_manage.json  | 1260 ++++++++++++++++++
 .../default_yarn_include_file_manage.json       | 1260 ++++++++++++++++++
 .../secured_yarn_include_file_dont_manage.json  | 1078 +++++++++++++++
 .../secured_yarn_include_file_manage.json       | 1078 +++++++++++++++
 ambari-web/app/controllers/installer.js         |    3 -
 ambari-web/app/mappers/hosts_mapper.js          |    2 +
 .../app/mixins/common/widgets/widget_mixin.js   |    2 +-
 ambari-web/app/models/host.js                   |    2 +
 ambari-web/app/views/main/host.js               |   10 +
 .../YARN/package/scripts/params_linux.py        |    5 +-
 .../2.0/services/YARN/package/scripts/yarn.py   |   16 +-
 pom.xml                                         |    2 +-
 63 files changed, 6537 insertions(+), 337 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/99484dcc/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------


Mime
View raw message