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/07/12 21:00:59 UTC
[6/6] 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/7a0850b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a0850b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a0850b4
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 7a0850b49577dea155ab76b4e7a13b3bb2d5291c
Parents: 7097109 eb3d3ea
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Jul 12 17:00:45 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Jul 12 17:00:45 2017 -0400
----------------------------------------------------------------------
.../python/ambari_commons/get_ambari_version.py | 44 ++++++
.../ambari/logfeeder/mapper/MapperDate.java | 42 ++++--
.../controller/DeleteIdentityHandler.java | 77 ++++++++--
.../server/controller/KerberosHelper.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 5 +-
.../utilities/KerberosIdentityCleaner.java | 88 +++--------
.../utilities/RemovableIdentities.java | 145 ++++++++++++++++++
.../controller/utilities/UsedIdentities.java | 101 +++++++++++++
.../ServiceComponentUninstalledEvent.java | 6 +
.../server/events/ServiceRemovedEvent.java | 29 ++--
.../ambari/server/orm/dao/ClusterDAO.java | 15 ++
.../orm/entities/ClusterConfigEntity.java | 3 +
.../org/apache/ambari/server/state/Cluster.java | 7 +
.../apache/ambari/server/state/ServiceImpl.java | 14 +-
.../server/state/cluster/ClusterImpl.java | 9 ++
.../AbstractKerberosDescriptorContainer.java | 12 ++
.../kerberos/KerberosComponentDescriptor.java | 15 --
.../kerberos/KerberosIdentityDescriptor.java | 14 +-
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 3 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 6 +
.../0.12.0.2.0/package/scripts/service_check.py | 3 +-
.../services/HIVE/configuration/hive-env.xml | 78 +++++-----
.../HIVE/configuration/hive-interactive-env.xml | 62 ++++----
.../services/HIVE/configuration/hive-site.xml | 35 +++++
.../stacks/HDP/2.6/services/HIVE/kerberos.json | 151 +++++++++++++++++++
.../stacks/HDP/2.6/services/YARN/kerberos.json | 2 +-
.../utilities/KerberosIdentityCleanerTest.java | 102 +++++++++++--
.../server/orm/dao/ServiceConfigDAOTest.java | 12 ++
.../stacks/2.0.6/HIVE/test_hive_server.py | 2 +
29 files changed, 861 insertions(+), 223 deletions(-)
----------------------------------------------------------------------