ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [26/26] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Thu, 22 Dec 2016 17:08:30 GMT
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/48079281
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48079281
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48079281

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 48079281714604afd445e6c89de116e49bfab5c0
Parents: 7a87817 bc1b7ab
Author: Nate Cole <ncole@hortonworks.com>
Authored: Thu Dec 22 12:07:50 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Thu Dec 22 12:07:50 2016 -0500

----------------------------------------------------------------------
 .../libraries/functions/stack_select.py         |   3 +-
 ambari-project/pom.xml                          |   3 +-
 ambari-server/checkstyle.xml                    |  10 +-
 ambari-server/sbin/ambari-server                |   6 +-
 .../ambari/server/agent/HeartbeatProcessor.java |   1 +
 .../api/services/serializers/CsvSerializer.java |  15 +-
 .../server/audit/event/AbstractAuditEvent.java  |  10 +-
 .../audit/event/AbstractUserAuditEvent.java     |   8 +-
 .../event/AccessUnauthorizedAuditEvent.java     |   4 +
 .../server/audit/event/LoginAuditEvent.java     |   1 +
 .../server/audit/event/LogoutAuditEvent.java    |   1 +
 .../audit/event/OperationStatusAuditEvent.java  |   1 +
 .../audit/event/TaskStatusAuditEvent.java       |   1 +
 .../kerberos/AbstractKerberosAuditEvent.java    |  12 +-
 .../ChangeSecurityStateKerberosAuditEvent.java  |   1 +
 .../CreateKeyTabKerberosAuditEvent.java         |   1 +
 .../CreatePrincipalKerberosAuditEvent.java      |   1 +
 .../DestroyPrincipalKerberosAuditEvent.java     |   1 +
 .../request/ActivateUserRequestAuditEvent.java  |   1 +
 .../request/AddAlertGroupRequestAuditEvent.java |   1 +
 .../AddAlertTargetRequestAuditEvent.java        |   1 +
 .../request/AddBlueprintRequestAuditEvent.java  |   1 +
 .../AddComponentToHostRequestAuditEvent.java    |   1 +
 .../request/AddCredentialRequestAuditEvent.java |   1 +
 .../event/request/AddHostRequestAuditEvent.java |   1 +
 .../request/AddRepositoryRequestAuditEvent.java |   1 +
 .../AddRepositoryVersionRequestAuditEvent.java  |   1 +
 .../request/AddRequestRequestAuditEvent.java    |   1 +
 .../request/AddUpgradeRequestAuditEvent.java    |   1 +
 .../AddUserToGroupRequestAuditEvent.java        |   1 +
 .../AddViewInstanceRequestAuditEvent.java       |   1 +
 .../request/AdminUserRequestAuditEvent.java     |   1 +
 .../BlueprintExportRequestAuditEvent.java       |   1 +
 .../ChangeAlertGroupRequestAuditEvent.java      |   1 +
 .../ChangeAlertTargetRequestAuditEvent.java     |   1 +
 ...hangeRepositoryVersionRequestAuditEvent.java |   1 +
 .../ChangeViewInstanceRequestAuditEvent.java    |   1 +
 .../ClientConfigDownloadRequestAuditEvent.java  |   1 +
 .../ClusterNameChangeRequestAuditEvent.java     |   1 +
 ...ClusterPrivilegeChangeRequestAuditEvent.java |   1 +
 .../ConfigurationChangeRequestAuditEvent.java   |   1 +
 .../request/CreateGroupRequestAuditEvent.java   |   1 +
 .../request/CreateUserRequestAuditEvent.java    |   1 +
 .../event/request/DefaultRequestAuditEvent.java |  54 ++
 .../DeleteAlertGroupRequestAuditEvent.java      |   1 +
 .../DeleteAlertTargetRequestAuditEvent.java     |   1 +
 .../DeleteBlueprintRequestAuditEvent.java       |   1 +
 .../request/DeleteGroupRequestAuditEvent.java   |   1 +
 .../request/DeleteHostRequestAuditEvent.java    |   1 +
 ...eleteRepositoryVersionRequestAuditEvent.java |   1 +
 .../request/DeleteServiceRequestAuditEvent.java |   1 +
 .../request/DeleteUserRequestAuditEvent.java    |   1 +
 .../DeleteViewInstanceRequestAuditEvent.java    |   1 +
 .../MembershipChangeRequestAuditEvent.java      |   1 +
 .../PrivilegeChangeRequestAuditEvent.java       |   1 +
 .../RemoveUserFromGroupRequestAuditEvent.java   |   1 +
 .../StartOperationRequestAuditEvent.java        |   1 +
 .../UpdateRepositoryRequestAuditEvent.java      |   1 +
 .../UpdateUpgradeItemRequestAuditEvent.java     |   1 +
 .../UserPasswordChangeRequestAuditEvent.java    |   1 +
 .../ViewPrivilegeChangeRequestAuditEvent.java   |   1 +
 .../server/audit/request/RequestAuditEvent.java |  31 +-
 .../eventcreator/DefaultEventCreator.java       |   4 +-
 .../server/bootstrap/BSHostStatusCollector.java |  12 +-
 .../ambari/server/bootstrap/BSRunner.java       |   2 +-
 .../AmbariManagementControllerImpl.java         | 279 +++++++--
 .../gsinstaller/ClusterDefinition.java          |   9 +-
 .../internal/AbstractProviderModule.java        |   4 +-
 .../internal/ComponentResourceProvider.java     |   6 +-
 .../internal/ConfigurationResourceProvider.java |  12 +-
 .../internal/HostResourceProvider.java          |  26 +-
 .../CachedRoleCommandOrderProvider.java         |   6 +-
 .../server/metadata/RoleCommandOrder.java       |   3 +-
 .../server/orm/entities/AlertGroupEntity.java   |  30 +-
 .../server/orm/entities/AlertTargetEntity.java  |  28 +-
 .../AmbariAuthorizationFilter.java              |   2 +
 .../AmbariLdapAuthoritiesPopulator.java         |  21 +-
 .../authorization/RoleAuthorization.java        |   8 +-
 .../security/encryption/CredentialProvider.java |  13 +-
 .../kerberos/IPAKerberosOperationHandler.java   |  16 +-
 .../kerberos/MITKerberosOperationHandler.java   |   5 +-
 .../stack/QuickLinksConfigurationModule.java    |   4 -
 .../apache/ambari/server/stack/ThemeModule.java |   4 -
 .../ambari/server/state/ConfigHelper.java       |  15 +-
 .../apache/ambari/server/state/ServiceInfo.java |  28 +-
 .../server/state/cluster/ClusterImpl.java       |   3 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |  24 +-
 .../server/upgrade/UpgradeCatalog250.java       |  71 +++
 .../apache/ambari/server/utils/Closeables.java  |  72 +++
 .../server/view/ViewDirectoryWatcher.java       |   8 +-
 .../apache/ambari/server/view/ViewRegistry.java |  24 +-
 .../server/view/ViewURLStreamProvider.java      |   3 +-
 ambari-server/src/main/python/ambari-server.py  |  14 +-
 .../main/python/ambari_server/kerberos_setup.py |  99 ++++
 .../main/python/ambari_server/setupActions.py   |   1 +
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   9 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   9 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   9 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   9 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   9 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   9 +
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |   6 +
 .../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml |  50 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |   4 +-
 .../2.1.0.2.0/package/scripts/params_windows.py |   2 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |   2 +-
 .../0.5.0.2.2/package/scripts/params_linux.py   |   2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |   2 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |   2 +-
 .../0.6.0.2.5/package/scripts/master.py         |  21 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |  10 +-
 .../scripts/shared_initialization.py            |   2 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   2 +-
 .../services/HDFS/configuration/hdfs-log4j.xml  |  50 +-
 .../configuration/application-properties.xml    |   3 +-
 .../services/ATLAS/themes/theme_version_2.json  |   2 +-
 .../HDP/2.6/services/ZEPPELIN/metainfo.xml      |   2 +-
 .../3.0/hooks/before-START/scripts/params.py    |   2 +-
 .../server/agent/TestHeartbeatHandler.java      |   4 +-
 .../AmbariCustomCommandExecutionHelperTest.java |  26 +-
 .../internal/MemberResourceProviderTest.java    |   1 -
 .../UpgradeSummaryResourceProviderTest.java     |   2 +-
 .../logging/LogQueryResponseTest.java           | 188 +++---
 .../LogSearchDataRetrievalServiceTest.java      |   8 -
 .../logging/LoggingRequestHelperImplTest.java   | 284 +++------
 .../server/orm/dao/AlertDispatchDAOTest.java    |  51 +-
 .../security/TestAuthenticationFactory.java     |   5 +
 ...ariAuthorizationProviderDisableUserTest.java |   2 +-
 .../TestAmbariLdapAuthoritiesPopulator.java     |  63 +-
 .../server/state/ConfigMergeHelperTest.java     |  12 +-
 .../QuickLinksProfileParserTest.java            |   2 +-
 .../server/testing/DeadlockedThreadsTest.java   |  14 +-
 .../server/topology/BlueprintImplTest.java      |   1 -
 .../ClusterDeployWithStartOnlyTest.java         |   1 -
 ...InstallWithoutStartOnComponentLevelTest.java |   1 -
 .../ClusterInstallWithoutStartTest.java         |   1 -
 .../server/upgrade/UpgradeCatalog210Test.java   |   6 +-
 .../server/upgrade/UpgradeCatalog221Test.java   |   5 +-
 .../server/upgrade/UpgradeCatalog250Test.java   | 153 ++++-
 .../ambari/server/utils/CloseablesTest.java     |  91 +++
 .../hooks/before-START/test_before_start.py     |   8 +-
 .../stacks/2.2/common/test_stack_advisor.py     |   2 +-
 ambari-web/app/config.js                        |   1 +
 .../global/background_operations_controller.js  |  60 +-
 .../controllers/global/cluster_controller.js    | 179 +++---
 .../global/configuration_controller.js          |  14 +-
 .../app/controllers/global/update_controller.js |   5 +-
 .../global/user_settings_controller.js          |  67 ++-
 .../alert_definitions_actions_controller.js     |  48 +-
 .../alerts/definition_configs_controller.js     | 182 +++---
 ambari-web/app/controllers/main/host/details.js | 294 ++++-----
 ambari-web/app/models/alerts/alert_config.js    |  34 +-
 ambari-web/app/styles/alerts.less               |   2 +-
 ambari-web/app/styles/application.less          |   4 +
 ambari-web/app/styles/dashboard.less            |  21 +-
 ambari-web/app/styles/wizard.less               |   3 -
 .../admin/highAvailability/nameNode/step1.hbs   |  26 +-
 .../main/dashboard/plus_button_filter.hbs       |  14 +-
 .../app/templates/main/host/addHost/step4.hbs   |  56 +-
 .../host/details/addDeleteComponentPopup.hbs    |   6 +-
 .../main/service/all_services_actions.hbs       |   4 +-
 ambari-web/app/views/main/dashboard/widgets.js  |   1 -
 .../global/background_operations_test.js        | 241 +++++++-
 .../global/cluster_controller_test.js           | 592 +++++++++++++++++++
 .../global/configuration_controller_test.js     | 163 +++++
 .../global/errors_handler_controller_test.js    |  10 +
 .../global/update_controller_test.js            | 122 ++++
 .../global/user_settings_controller_test.js     | 300 ++++++++++
 .../definitions_configs_controller_test.js      |  76 +--
 .../test/controllers/main/host/details_test.js  | 112 +---
 170 files changed, 3386 insertions(+), 1463 deletions(-)
----------------------------------------------------------------------



Mime
View raw message