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/19 16:08:32 UTC
[19/32] 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/ed2018bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed2018bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed2018bf
Branch: refs/heads/trunk
Commit: ed2018bf06ec5ee18eb3c0c618f664db0d058025
Parents: 5cf5c83 6587fda
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Oct 10 20:37:39 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Oct 10 20:37:39 2016 -0400
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 6 +
ambari-server/conf/unix/install-helper.sh | 1 +
ambari-server/conf/windows/ambari.properties | 6 +
ambari-server/sbin/ambari-server | 4 +-
.../server/configuration/Configuration.java | 135 +++++++++++++++++++
.../AmbariManagementControllerImpl.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 6 +-
.../controller/ServiceComponentHostRequest.java | 4 +-
.../BlueprintConfigurationProcessor.java | 113 ++++++++++++----
.../internal/HostComponentResourceProvider.java | 44 +++---
.../security/AbstractSecurityHeaderFilter.java | 43 ++++++
.../AmbariServerSecurityHeaderFilter.java | 3 +
.../AmbariViewsSecurityHeaderFilter.java | 3 +
.../server/serveraction/ServerAction.java | 6 +
.../BlueprintConfigurationProcessorTest.java | 82 +++++++++++
.../AbstractSecurityHeaderFilterTest.java | 38 +++++-
.../AmbariServerSecurityHeaderFilterTest.java | 7 +
.../AmbariViewsSecurityHeaderFilterTest.java | 6 +
.../main/admin/stack_and_upgrade_controller.js | 56 ++++----
ambari-web/app/messages.js | 1 +
ambari-web/app/routes/add_service_routes.js | 24 ++++
.../configs/service_configs_by_category_view.js | 12 +-
.../admin/stack_and_upgrade_controller_test.js | 45 +++++--
.../8.0.5/package/scripts/microsoft_r.py | 11 +-
.../MICROSOFT_R/8.0.5/metainfo.xml | 19 +++
.../MICROSOFT_R/8.0.5/repos/repoinfo.xml | 7 +
26 files changed, 583 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed2018bf/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------