You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/12/06 15:06:30 UTC
[14/14] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6484948a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6484948a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6484948a
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 6484948a26629431b877c039aed6988c5be68867
Parents: c2e5d09 e973986
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Dec 6 10:06:07 2017 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Dec 6 10:06:07 2017 -0500
----------------------------------------------------------------------
.../admin-web/app/views/ambariViews/edit.html | 8 +--
.../app/views/ambariViews/viewsList.html | 2 +-
.../app/views/directives/editableList.html | 2 +-
.../app/views/modals/AddRepositoryModal.html | 2 +-
.../app/views/modals/RoleDetailsModal.html | 2 +-
.../app/views/remoteClusters/list.html | 2 +-
.../admin-web/app/views/stackVersions/list.html | 4 +-
.../views/stackVersions/stackVersionPage.html | 4 +-
.../app/views/userManagement/groupEdit.html | 12 ++--
.../app/views/userManagement/groupsList.html | 6 +-
.../userManagement/modals/changePassword.html | 2 +-
.../app/views/userManagement/userEdit.html | 16 +++---
.../app/views/userManagement/usersList.html | 4 +-
.../RequiredServicesInRepositoryCheck.java | 18 ++----
.../ClusterStackVersionResourceProvider.java | 14 ++---
.../state/repository/VersionDefinitionXml.java | 59 ++++++++++++++++++--
.../1.10.3-10/configuration/kerberos-env.xml | 3 +-
.../1.10.3-30/configuration/kerberos-env.xml | 3 +-
.../MAHOUT/1.0.0.2.3/package/scripts/mahout.py | 12 +++-
.../PIG/0.12.0.2.0/package/scripts/pig.py | 16 ++++--
.../PIG/0.16.1.3.0/package/scripts/pig.py | 16 ++++--
.../SPARK/1.2.1/package/scripts/livy_service.py | 18 +++---
.../SPARK/1.2.1/package/scripts/params.py | 2 +
.../SPARK/1.2.1/package/scripts/setup_spark.py | 20 +++----
.../SPARK/2.2.0/package/scripts/livy_service.py | 13 ++++-
.../SPARK/2.2.0/package/scripts/params.py | 2 +
.../SPARK/2.2.0/package/scripts/setup_spark.py | 25 +++++----
.../2.0.0/package/scripts/livy2_service.py | 11 +++-
.../SPARK2/2.0.0/package/scripts/params.py | 2 +
.../SPARK2/2.0.0/package/scripts/setup_spark.py | 22 ++++----
.../scripts/interpreter_json_template.py | 2 +-
.../KERBEROS/configuration/kerberos-env.xml | 3 +-
.../RequiredServicesInRepositoryCheckTest.java | 6 +-
.../state/repository/VersionDefinitionTest.java | 55 ++++++++++++++++++
.../2.6/ZEPPELIN/interpreter_json_generated.py | 8 +--
35 files changed, 261 insertions(+), 135 deletions(-)
----------------------------------------------------------------------