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/09/21 13:29:43 UTC
[21/21] 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/c8edd3c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c8edd3c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c8edd3c8
Branch: refs/heads/branch-dev-patch-upgrade
Commit: c8edd3c8aa061d7be3a11c76dd79e9e65801a72b
Parents: 79e6786 6038e01
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Sep 21 09:29:10 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Sep 21 09:29:10 2016 -0400
----------------------------------------------------------------------
.../ambariViews/CreateViewInstanceCtrl.js | 35 ++-
.../loginActivities/HomeDirectoryCtrl.js | 73 ++++--
.../ui/admin-web/app/scripts/i18n.config.js | 4 +
.../ui/admin-web/app/scripts/routes.js | 5 +
.../admin-web/app/views/ambariViews/create.html | 2 +-
.../app/views/ambariViews/listTable.html | 3 +
.../views/loginActivities/homeDirectory.html | 2 +-
.../ui/admin-web/app/views/users/create.html | 18 +-
.../unit/controllers/CreateViewInstanceCtrl.js | 40 ++++
ambari-agent/conf/unix/ambari-agent | 36 +--
.../src/main/python/ambari_agent/Controller.py | 4 +-
.../src/main/python/ambari_agent/Hardware.py | 2 +-
.../ambari_commons/ambari_metrics_helper.py | 5 +-
.../ambari_commons/parallel_processing.py | 95 ++++++++
ambari-project/pom.xml | 5 +
ambari-server/pom.xml | 9 +-
ambari-server/sbin/ambari-server | 16 +-
.../server/configuration/Configuration.java | 30 ++-
.../server/controller/KerberosHelper.java | 2 +
.../server/controller/KerberosHelperImpl.java | 18 +-
.../server/orm/dao/HostConfigMappingDAO.java | 4 +-
.../server/security/AmbariEntryPoint.java | 15 +-
.../AmbariAuthToLocalUserDetailsService.java | 139 +++++++++++
.../AmbariKerberosAuthenticationFilter.java | 172 ++++++++++++++
.../kerberos/AmbariKerberosTicketValidator.java | 93 ++++++++
.../AbstractPrepareKerberosServerAction.java | 10 +-
.../ConfigureAmbariIdentitiesServerAction.java | 235 +++++++++++++++++++
.../ConfigureAmbariIndetityServerAction.java | 208 ----------------
.../kerberos/CreatePrincipalsServerAction.java | 5 +-
.../kerberos/KerberosServerAction.java | 12 +-
.../ambari/server/stack/StackManager.java | 17 +-
.../server/stack/StackServiceDirectory.java | 12 +-
.../package/scripts/metrics_grafana_util.py | 50 +++-
.../0.1.0/package/scripts/params.py | 3 +
.../0.1.0/package/scripts/service_check.py | 225 ++++++++++--------
.../metrics_grafana_datasource.json.j2 | 2 +-
.../package/alerts/alert_hive_metastore.py | 2 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 106 +++++++--
.../webapp/WEB-INF/spring-security.xml | 32 ++-
.../server/agent/TestHeartbeatMonitor.java | 14 +-
.../server/api/services/AmbariMetaInfoTest.java | 41 +++-
.../AmbariManagementControllerTest.java | 4 +
.../server/controller/KerberosHelperTest.java | 6 +-
...ClusterStackVersionResourceProviderTest.java | 1 +
...ThreadPoolExecutorCompletionServiceTest.java | 6 +-
.../server/orm/InMemoryDefaultTestModule.java | 14 +-
.../apache/ambari/server/orm/TestOrmImpl.java | 116 ++++++---
.../server/orm/dao/AlertDispatchDAOTest.java | 235 ++++++++++++-------
...AmbariAuthToLocalUserDetailsServiceTest.java | 92 ++++++++
.../AmbariKerberosAuthenticationFilterTest.java | 133 +++++++++++
.../AmbariKerberosTicketValidatorTest.java | 49 ++++
.../security/authorization/TestUsers.java | 7 +
.../upgrades/ConfigureActionTest.java | 212 ++++++++++-------
.../upgrades/UpgradeActionTest.java | 153 ++++++------
.../ambari/server/stack/StackManagerMock.java | 166 +++++++++++++
.../apache/ambari/server/state/ServiceTest.java | 124 ++++++----
.../ambari/server/state/UpgradeHelperTest.java | 26 ++
.../svccomphost/ServiceComponentHostTest.java | 34 +--
.../server/upgrade/UpgradeCatalog210Test.java | 7 +
.../HAWQ/test_service_advisor.py | 10 +-
.../resourceManager/step3_controller.js | 1 -
.../service/manage_config_groups_controller.js | 36 +++
.../mixins/common/configs/enhanced_configs.js | 24 +-
ambari-web/app/mixins/common/serverValidator.js | 7 +-
.../manage_configuration_groups_popup.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 4 +-
ambari-web/app/utils/blueprint.js | 10 +-
ambari-web/app/utils/config.js | 45 ++--
.../views/common/widget/graph_widget_view.js | 7 +-
ambari-web/brunch-config.js | 125 ++++++++++
ambari-web/config.coffee | 112 ---------
ambari-web/package.json | 1 +
.../common/configs/enhanced_configs_test.js | 79 +------
.../capacityscheduler/ConfigurationService.java | 2 +-
.../main/resources/ui/pig-web/app/initialize.js | 5 +
75 files changed, 2605 insertions(+), 1051 deletions(-)
----------------------------------------------------------------------