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 2016/02/24 16:07:55 UTC
[08/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/e7bdb7b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7bdb7b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7bdb7b0
Branch: refs/heads/trunk
Commit: e7bdb7b05478d39970680cc92c95177595ff3277
Parents: 986a518 f4edad8
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Jan 27 10:33:04 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Jan 27 10:33:04 2016 -0500
----------------------------------------------------------------------
.../app/scripts/directives/editableList.js | 9 ++
.../src/main/python/core/host_info.py | 8 +-
ambari-server/pom.xml | 11 +-
.../server/configuration/Configuration.java | 13 ++
.../ambari/server/controller/AmbariServer.java | 2 +
.../server/controller/ControllerModule.java | 2 +
.../controller/utilities/KerberosChecker.java | 127 +++++++++++++++++++
.../server/upgrade/SchemaUpgradeHelper.java | 1 +
.../server/upgrade/UpgradeCatalog222.java | 125 ++++++++++++++++++
.../server/upgrade/UpgradeCatalog230.java | 2 +-
.../server/upgrade/UpgradeCatalog240.java | 26 ++--
.../src/main/package/deb/control/postinst | 6 +-
.../src/main/package/deb/control/prerm | 4 +-
.../src/main/package/rpm/postinstall.sh | 6 +-
ambari-server/src/main/package/rpm/preremove.sh | 4 +-
.../python/ambari_server/serverConfiguration.py | 5 +-
.../main/python/ambari_server/setupSecurity.py | 5 +-
.../HBASE/0.96.0.2.0/alerts.json | 37 ------
.../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 10 ++
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 14 ++
.../4.0.0.2.0/package/scripts/params_linux.py | 5 +
.../4.0.0.2.0/package/templates/oozie.conf.j2 | 35 +++++
.../stacks/HDP/2.0.6/services/stack_advisor.py | 3 +
.../utilities/KerberosCheckerTest.java | 88 +++++++++++++
.../server/upgrade/UpgradeCatalog222Test.java | 104 +++++++++++++++
.../server/upgrade/UpgradeCatalog230Test.java | 2 +-
.../stacks/2.0.6/OOZIE/test_oozie_client.py | 33 +++++
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 44 +++++++
ambari-web/app/controllers/main/host/details.js | 7 +-
ambari-web/app/messages.js | 2 +
ambari-web/app/models/host_component.js | 6 +
ambari-web/app/styles/application.less | 3 +
.../main/host/details/host_component.hbs | 3 +-
ambari-web/app/utils/ember_computed.js | 2 +-
.../main/host/details/host_component_view.js | 17 +++
.../test/controllers/main/host/details_test.js | 10 ++
36 files changed, 713 insertions(+), 68 deletions(-)
----------------------------------------------------------------------