You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/10/06 16:00:46 UTC
[12/12] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-18456
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/78a875cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78a875cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78a875cf
Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 78a875cf2774457e769d147d2e985de20f6e64b8
Parents: 3870044 56e00ac
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Oct 6 12:00:10 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu Oct 6 12:00:10 2016 -0400
----------------------------------------------------------------------
.../src/main/python/ambari_agent/HostCleanup.py | 32 +++++----
.../python/ambari_agent/alerts/web_alert.py | 12 +---
.../main/python/ambari_commons/inet_utils.py | 21 ++++++
.../libraries/providers/hdfs_resource.py | 2 +-
ambari-metrics/pom.xml | 4 +-
.../ambari/server/api/services/UserService.java | 2 +-
.../server/controller/StackServiceResponse.java | 16 ++++-
.../internal/StackServiceResourceProvider.java | 6 ++
.../internal/UserResourceProvider.java | 25 ++++++-
.../predicate/ComparisonPredicate.java | 16 ++++-
.../controller/predicate/EqualsPredicate.java | 15 +++++
.../server/security/authorization/User.java | 2 +-
.../server/security/authorization/Users.java | 8 +--
.../RangerKerberosConfigCalculation.java | 32 +++++----
.../ambari/server/stack/ServiceModule.java | 6 +-
.../apache/ambari/server/state/ServiceInfo.java | 27 ++++++++
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 12 ++--
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 15 +----
.../src/main/resources/properties.json | 1 +
.../resources/stacks/HDP/2.6/repos/repoinfo.xml | 18 ++---
.../server/api/services/UserServiceTest.java | 71 --------------------
.../server/security/SecurityHelperImplTest.java | 4 +-
.../AmbariUserAuthenticationFilterTest.java | 2 +-
.../RangerKerberosConfigCalculationTest.java | 6 +-
.../ambari/server/stack/ServiceModuleTest.java | 19 ++++++
.../ambari/server/state/ServiceInfoTest.java | 30 +++++++++
.../server/upgrade/UpgradeCatalog240Test.java | 6 +-
pom.xml | 6 --
utility/pom.xml | 34 +++++++++-
29 files changed, 284 insertions(+), 166 deletions(-)
----------------------------------------------------------------------