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 2017/05/25 17:24:45 UTC

[35/35] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556

Merge branch 'trunk' into branch-feature-AMBARI-12556


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/245afc1b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/245afc1b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/245afc1b

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 245afc1b4fa87b6d5ce30f403c15858f90d2ce86
Parents: 7a7f489 14acc0a
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu May 25 12:57:50 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu May 25 12:57:50 2017 -0400

----------------------------------------------------------------------
 .../main/resources/ui/admin-web/app/index.html  |   2 +-
 .../resources/ui/admin-web/app/styles/main.css  |   7 +-
 .../admin-web/app/views/ambariViews/edit.html   |   2 +-
 .../main/python/ambari_commons/inet_utils.py    |  12 ++
 .../persist/jpa/AmbariJpaPersistModule.java     |   2 +-
 .../persist/jpa/AmbariJpaPersistService.java    |   2 +-
 .../apache/ambari/annotations/Experimental.java |   2 +-
 .../ambari/annotations/ExperimentalFeature.java |   2 +-
 .../org/apache/ambari/annotations/Markdown.java |   2 +-
 .../ambari/annotations/TransactionalLock.java   |   2 +-
 .../apache/ambari/server/AmbariException.java   |   2 +-
 .../org/apache/ambari/server/AmbariService.java |   2 +-
 .../ambari/server/ClusterNotFoundException.java |   2 +-
 .../server/ConfigGroupNotFoundException.java    |   2 +-
 .../ambari/server/DBConnectionVerification.java |   2 +-
 .../server/DuplicateResourceException.java      |   2 +-
 .../apache/ambari/server/EagerSingleton.java    |   2 +-
 .../ambari/server/HostNotFoundException.java    |   2 +-
 .../server/KdcServerConnectionVerification.java |   2 +-
 .../ambari/server/ObjectNotFoundException.java  |   2 +-
 .../server/ParentObjectNotFoundException.java   |   2 +-
 .../java/org/apache/ambari/server/Role.java     |   2 +-
 .../org/apache/ambari/server/RoleCommand.java   |   2 +-
 .../ServiceComponentHostNotFoundException.java  |   2 +-
 .../ServiceComponentNotFoundException.java      |   2 +-
 .../ambari/server/ServiceNotFoundException.java |   2 +-
 .../ambari/server/StackAccessException.java     |   2 +-
 .../ambari/server/StateRecoveryManager.java     |   2 +-
 .../apache/ambari/server/StaticallyInject.java  |   2 +-
 .../server/actionmanager/ActionDBAccessor.java  |   2 +-
 .../actionmanager/ActionDBAccessorImpl.java     |   2 +-
 .../server/actionmanager/ActionManager.java     |   2 +-
 .../server/actionmanager/ActionScheduler.java   |   2 +-
 .../ambari/server/actionmanager/ActionType.java |   2 +-
 .../ExecutionCommandWrapperFactory.java         |   2 +-
 .../server/actionmanager/HostRoleCommand.java   |   2 +-
 .../server/actionmanager/HostRoleStatus.java    |   2 +-
 .../ambari/server/actionmanager/Request.java    |   8 +-
 .../server/actionmanager/RequestStatus.java     |   2 +-
 .../ServiceComponentHostEventWrapper.java       |   6 +-
 .../ambari/server/actionmanager/Stage.java      |   2 +-
 .../server/actionmanager/TargetHostType.java    |   2 +-
 .../apache/ambari/server/agent/ActionQueue.java |   2 +-
 .../ambari/server/agent/AgentCommand.java       |   2 +-
 .../apache/ambari/server/agent/AgentEnv.java    |   2 +-
 .../ambari/server/agent/AgentRequests.java      |   2 +-
 .../server/agent/AlertDefinitionCommand.java    |   2 +-
 .../server/agent/AlertExecutionCommand.java     |   2 +-
 .../ambari/server/agent/CancelCommand.java      |   2 +-
 .../ambari/server/agent/CommandReport.java      |   2 +-
 .../server/agent/ComponentRecoveryReport.java   |   2 +-
 .../ambari/server/agent/ComponentStatus.java    |   2 +-
 .../ambari/server/agent/ComponentsResponse.java |   2 +-
 .../apache/ambari/server/agent/DiskInfo.java    |   2 +-
 .../ambari/server/agent/ExecutionCommand.java   |   2 +-
 .../apache/ambari/server/agent/HeartBeat.java   |   2 +-
 .../ambari/server/agent/HeartBeatHandler.java   |   7 +-
 .../ambari/server/agent/HeartBeatResponse.java  |   2 +-
 .../ambari/server/agent/HeartbeatMonitor.java   |   2 +-
 .../ambari/server/agent/HeartbeatProcessor.java |   2 +-
 .../apache/ambari/server/agent/HostInfo.java    |   2 +-
 .../apache/ambari/server/agent/HostStatus.java  |   2 +-
 .../ambari/server/agent/RecoveryConfig.java     |   2 +-
 .../server/agent/RecoveryConfigHelper.java      |   4 +-
 .../ambari/server/agent/RecoveryReport.java     |   2 +-
 .../apache/ambari/server/agent/Register.java    |   2 +-
 .../server/agent/RegistrationCommand.java       |   2 +-
 .../server/agent/RegistrationResponse.java      |   2 +-
 .../ambari/server/agent/RegistrationStatus.java |   2 +-
 .../ambari/server/agent/StatusCommand.java      |   2 +-
 .../ambari/server/agent/rest/AgentResource.java |   2 +-
 .../alerts/AgentHeartbeatAlertRunnable.java     |   2 +-
 .../ambari/server/alerts/AlertRunnable.java     |   2 +-
 .../alerts/AmbariPerformanceRunnable.java       |   2 +-
 .../alerts/ComponentVersionAlertRunnable.java   |   4 +-
 .../server/alerts/StaleAlertRunnable.java       |   2 +-
 .../ambari/server/api/GsonJsonProvider.java     |   2 +-
 .../server/api/UserNameOverrideFilter.java      |   2 +-
 .../api/handlers/BaseManagementHandler.java     |   2 +-
 .../server/api/handlers/CreateHandler.java      |   2 +-
 .../server/api/handlers/DeleteHandler.java      |   2 +-
 .../server/api/handlers/QueryCreateHandler.java |   2 +-
 .../ambari/server/api/handlers/ReadHandler.java |   2 +-
 .../server/api/handlers/RequestHandler.java     |   2 +-
 .../server/api/handlers/UpdateHandler.java      |   6 +-
 .../api/predicate/InvalidQueryException.java    |   2 +-
 .../server/api/predicate/PredicateCompiler.java |   2 +-
 .../ambari/server/api/predicate/QueryLexer.java |   6 +-
 .../server/api/predicate/QueryParser.java       |   2 +-
 .../ambari/server/api/predicate/Token.java      |   2 +-
 .../expressions/AbstractExpression.java         |   2 +-
 .../api/predicate/expressions/Expression.java   |   2 +-
 .../expressions/LogicalExpression.java          |   2 +-
 .../expressions/LogicalExpressionFactory.java   |   2 +-
 .../expressions/NotLogicalExpression.java       |   2 +-
 .../expressions/RelationalExpression.java       |   2 +-
 .../predicate/operators/AbstractOperator.java   |   2 +-
 .../api/predicate/operators/AndOperator.java    |   2 +-
 .../api/predicate/operators/EqualsOperator.java |   2 +-
 .../api/predicate/operators/FilterOperator.java |   2 +-
 .../operators/GreaterEqualsOperator.java        |   2 +-
 .../predicate/operators/GreaterOperator.java    |   2 +-
 .../api/predicate/operators/InOperator.java     |   2 +-
 .../predicate/operators/IsEmptyOperator.java    |   2 +-
 .../predicate/operators/LessEqualsOperator.java |   2 +-
 .../api/predicate/operators/LessOperator.java   |   2 +-
 .../predicate/operators/LogicalOperator.java    |   2 +-
 .../operators/LogicalOperatorFactory.java       |   2 +-
 .../predicate/operators/NotEqualsOperator.java  |   2 +-
 .../api/predicate/operators/NotOperator.java    |   2 +-
 .../api/predicate/operators/Operator.java       |   2 +-
 .../api/predicate/operators/OrOperator.java     |   2 +-
 .../predicate/operators/RelationalOperator.java |   2 +-
 .../operators/RelationalOperatorFactory.java    |   2 +-
 .../query/ExtendedResourcePredicateVisitor.java |   2 +-
 .../server/api/query/JpaPredicateVisitor.java   |   4 +-
 .../ambari/server/api/query/JpaSortBuilder.java |   2 +-
 .../api/query/ProcessingPredicateVisitor.java   |   2 +-
 .../apache/ambari/server/api/query/Query.java   |   2 +-
 .../ambari/server/api/query/QueryImpl.java      |   2 +-
 .../ambari/server/api/query/QueryInfo.java      |   2 +-
 .../api/query/SubResourcePredicateVisitor.java  |   2 +-
 .../api/query/render/AlertStateSummary.java     |   4 +-
 .../api/query/render/AlertStateValues.java      |   4 +-
 .../render/AlertSummaryGroupedRenderer.java     |   2 +-
 .../api/query/render/AlertSummaryRenderer.java  |   2 +-
 .../server/api/query/render/BaseRenderer.java   |   2 +-
 .../query/render/ClusterBlueprintRenderer.java  |   7 +-
 .../api/query/render/DefaultRenderer.java       |   2 +-
 .../query/render/MetricsPaddingRenderer.java    |   2 +-
 .../api/query/render/MinimalRenderer.java       |   2 +-
 .../server/api/query/render/Renderer.java       |   2 +-
 .../api/resources/ActionResourceDefinition.java |   2 +-
 .../ActiveWidgetLayoutResourceDefinition.java   |   2 +-
 .../resources/AlertDefResourceDefinition.java   |   2 +-
 .../resources/AlertGroupResourceDefinition.java |   2 +-
 .../AlertHistoryResourceDefinition.java         |   2 +-
 .../AlertNoticeResourceDefinition.java          |   2 +-
 .../api/resources/AlertResourceDefinition.java  |   2 +-
 .../AlertTargetResourceDefinition.java          |   2 +-
 .../api/resources/BaseResourceDefinition.java   |   2 +-
 .../resources/BlueprintResourceDefinition.java  |   2 +-
 .../ClientConfigResourceDefinition.java         |   2 +-
 .../resources/ClusterResourceDefinition.java    |   2 +-
 .../resources/ComponentResourceDefinition.java  |   2 +-
 ...ComponentStackVersionResourceDefinition.java |   2 +-
 .../ConfigGroupResourceDefinition.java          |   2 +-
 .../ConfigurationResourceDefinition.java        |   2 +-
 .../DetachedHostResourceDefinition.java         |   2 +-
 .../ExtensionLinkResourceDefinition.java        |   2 +-
 .../resources/ExtensionResourceDefinition.java  |   2 +-
 .../ExtensionVersionResourceDefinition.java     |   2 +-
 .../api/resources/FeedResourceDefinition.java   |   2 +-
 .../api/resources/GroupResourceDefinition.java  |   2 +-
 .../HostComponentProcessResourceDefinition.java |   2 +-
 .../HostComponentResourceDefinition.java        |   2 +-
 .../api/resources/HostResourceDefinition.java   |   2 +-
 .../resources/InstanceResourceDefinition.java   |   2 +-
 .../api/resources/JobResourceDefinition.java    |   2 +-
 .../LdapSyncEventResourceDefinition.java        |   2 +-
 .../resources/LoggingResourceDefinition.java    |   2 +-
 .../api/resources/MemberResourceDefinition.java |   2 +-
 .../OperatingSystemResourceDefinition.java      |   2 +-
 .../resources/PermissionResourceDefinition.java |   2 +-
 .../resources/PrivilegeResourceDefinition.java  |   2 +-
 .../RecommendationResourceDefinition.java       |   2 +-
 .../RemoteClusterResourceDefinition.java        |   2 +-
 .../resources/RepositoryResourceDefinition.java |   2 +-
 .../RepositoryVersionResourceDefinition.java    |   2 +-
 .../resources/RequestResourceDefinition.java    |   2 +-
 .../RequestScheduleResourceDefinition.java      |   2 +-
 .../api/resources/ResourceDefinition.java       |   2 +-
 .../server/api/resources/ResourceInstance.java  |   2 +-
 .../api/resources/ResourceInstanceFactory.java  |   2 +-
 .../resources/ResourceInstanceFactoryImpl.java  |   6 +-
 .../RootServiceComponentResourceDefinition.java |   2 +-
 ...tServiceHostComponentResourceDefinition.java |   2 +-
 .../RootServiceResourceDefinition.java          |   2 +-
 .../resources/ServiceResourceDefinition.java    |   2 +-
 .../api/resources/SimpleResourceDefinition.java |   4 +-
 ...nfigurationDependencyResourceDefinition.java |   2 +-
 .../StackConfigurationResourceDefinition.java   |   2 +-
 .../StackDependencyResourceDefinition.java      |   2 +-
 ...ackLevelConfigurationResourceDefinition.java |   2 +-
 .../api/resources/StackResourceDefinition.java  |   4 +-
 ...StackServiceComponentResourceDefinition.java |   2 +-
 .../StackServiceResourceDefinition.java         |   2 +-
 .../StackVersionResourceDefinition.java         |   2 +-
 .../api/resources/SubResourceDefinition.java    |   2 +-
 .../TargetClusterResourceDefinition.java        |   2 +-
 .../TaskAttemptResourceDefinition.java          |   2 +-
 .../api/resources/TaskResourceDefinition.java   |   4 +-
 .../resources/UpgradeResourceDefinition.java    |   2 +-
 .../api/resources/UserResourceDefinition.java   |   2 +-
 .../resources/ValidationResourceDefinition.java |   2 +-
 .../VersionDefinitionResourceDefinition.java    |   2 +-
 .../ViewExternalSubResourceDefinition.java      |   2 +-
 .../ViewInstanceResourceDefinition.java         |   2 +-
 .../ViewPermissionResourceDefinition.java       |   2 +-
 .../api/resources/ViewResourceDefinition.java   |   2 +-
 .../resources/ViewUrlResourceDefinition.java    |   2 +-
 .../ViewVersionResourceDefinition.java          |   2 +-
 .../WidgetLayoutResourceDefinition.java         |   2 +-
 .../api/resources/WidgetResourceDefinition.java |   3 +-
 .../resources/WorkflowResourceDefinition.java   |   2 +-
 .../server/api/rest/BootStrapResource.java      |   2 +-
 .../ambari/server/api/rest/HealthCheck.java     |   2 +-
 .../api/rest/KdcServerReachabilityCheck.java    |   2 +-
 .../server/api/services/ActionService.java      |   2 +-
 .../api/services/AlertDefinitionService.java    |   2 +-
 .../server/api/services/AlertGroupService.java  |   2 +-
 .../api/services/AlertHistoryService.java       |   2 +-
 .../server/api/services/AlertNoticeService.java |   2 +-
 .../server/api/services/AlertService.java       |   2 +-
 .../server/api/services/AlertTargetService.java |   4 +-
 .../server/api/services/AmbariMetaInfo.java     |   2 +-
 .../api/services/AmbariPrivilegeService.java    |   2 +-
 .../ambari/server/api/services/BaseRequest.java |   2 +-
 .../ambari/server/api/services/BaseService.java |   2 +-
 .../server/api/services/BlueprintService.java   |   2 +-
 .../api/services/ClusterPrivilegeService.java   |   2 +-
 .../services/ClusterStackVersionService.java    |   2 +-
 .../CompatibleRepositoryVersionService.java     |   2 +-
 .../server/api/services/ComponentService.java   |   2 +-
 .../server/api/services/ConfigGroupService.java |   2 +-
 .../api/services/ConfigurationService.java      |   2 +-
 .../server/api/services/DeleteRequest.java      |   2 +-
 .../api/services/DeleteResultMetadata.java      |   2 +-
 .../api/services/ExtensionLinksService.java     |   2 +-
 .../server/api/services/ExtensionsService.java  |   2 +-
 .../ambari/server/api/services/FeedService.java |   2 +-
 .../ambari/server/api/services/GetRequest.java  |   2 +-
 .../api/services/HostComponentService.java      |   2 +-
 .../ambari/server/api/services/HostService.java |   2 +-
 .../api/services/HostStackVersionService.java   |   2 +-
 .../server/api/services/InstanceService.java    |   2 +-
 .../ambari/server/api/services/JobService.java  |   2 +-
 .../api/services/LdapSyncEventService.java      |   2 +-
 .../server/api/services/LocalUriInfo.java       |   2 +-
 .../server/api/services/LoggingService.java     |   2 +-
 .../server/api/services/NamedPropertySet.java   |   2 +-
 .../api/services/OperatingSystemService.java    |  19 +--
 .../server/api/services/PermissionService.java  |   2 +-
 .../api/services/PersistKeyValueImpl.java       |   2 +-
 .../api/services/PersistKeyValueService.java    |   2 +-
 .../ambari/server/api/services/PostRequest.java |   2 +-
 .../api/services/PreUpgradeCheckService.java    |   2 +-
 .../server/api/services/PrivilegeService.java   |   2 +-
 .../ambari/server/api/services/PutRequest.java  |   2 +-
 .../server/api/services/QueryPostRequest.java   |   2 +-
 .../api/services/RecommendationService.java     |   2 +-
 .../api/services/RemoteClustersService.java     |   2 +-
 .../server/api/services/RepositoryService.java  |  19 +--
 .../api/services/RepositoryVersionService.java  |   2 +-
 .../ambari/server/api/services/Request.java     |   2 +-
 .../ambari/server/api/services/RequestBody.java |   2 +-
 .../server/api/services/RequestFactory.java     |   2 +-
 .../api/services/RequestScheduleService.java    |   2 +-
 .../server/api/services/RequestService.java     |   2 +-
 .../ambari/server/api/services/Result.java      |   2 +-
 .../ambari/server/api/services/ResultImpl.java  |   2 +-
 .../server/api/services/ResultMetadata.java     |   2 +-
 .../api/services/ResultPostProcessor.java       |   2 +-
 .../api/services/ResultPostProcessorImpl.java   |   2 +-
 .../server/api/services/ResultStatus.java       |   2 +-
 .../server/api/services/StacksService.java      |   2 +-
 .../server/api/services/StageService.java       |   2 +-
 .../api/services/TargetClusterService.java      |   2 +-
 .../server/api/services/TaskAttemptService.java |   2 +-
 .../ambari/server/api/services/TaskService.java |   2 +-
 .../api/services/UpgradeGroupService.java       |   2 +-
 .../server/api/services/UpgradeItemService.java |   2 +-
 .../server/api/services/UpgradeService.java     |   2 +-
 .../api/services/UpgradeSummaryService.java     |   4 +-
 .../server/api/services/ValidationService.java  |   2 +-
 .../api/services/VersionDefinitionService.java  |   2 +-
 .../server/api/services/ViewUrlsService.java    |   2 +-
 .../api/services/WidgetLayoutService.java       |   2 +-
 .../server/api/services/WidgetService.java      |   2 +-
 .../server/api/services/WorkflowService.java    |   2 +-
 .../api/services/groups/GroupService.java       |   2 +-
 .../api/services/groups/MemberService.java      |   2 +-
 .../services/parsers/BodyParseException.java    |   2 +-
 .../services/parsers/JsonRequestBodyParser.java |   2 +-
 .../api/services/parsers/RequestBodyParser.java |   2 +-
 .../persistence/PersistenceManager.java         |   2 +-
 .../persistence/PersistenceManagerImpl.java     |   2 +-
 .../services/serializers/JsonSerializer.java    |   2 +-
 .../services/serializers/ResultSerializer.java  |   2 +-
 .../stackadvisor/StackAdvisorException.java     |   2 +-
 .../stackadvisor/StackAdvisorHelper.java        |   2 +-
 .../stackadvisor/StackAdvisorRequest.java       |   2 +-
 .../StackAdvisorRequestException.java           |   2 +-
 .../stackadvisor/StackAdvisorResponse.java      |   2 +-
 .../stackadvisor/StackAdvisorRunner.java        |   2 +-
 .../ComponentLayoutRecommendationCommand.java   |   2 +-
 .../ComponentLayoutValidationCommand.java       |   2 +-
 ...rationDependenciesRecommendationCommand.java |   2 +-
 .../ConfigurationRecommendationCommand.java     |   2 +-
 .../ConfigurationValidationCommand.java         |   2 +-
 .../commands/StackAdvisorCommand.java           |   2 +-
 .../commands/StackAdvisorCommandType.java       |   2 +-
 .../recommendations/RecommendationResponse.java |   2 +-
 .../validations/ValidationResponse.java         |   2 +-
 .../users/ActiveWidgetLayoutService.java        |   2 +-
 .../services/users/UserPrivilegeService.java    |   4 +-
 .../server/api/services/users/UserService.java  |   2 +-
 .../views/ViewDataMigrationService.java         |   2 +-
 .../views/ViewExternalSubResourceService.java   |   2 +-
 .../services/views/ViewPermissionService.java   |   2 +-
 .../services/views/ViewPrivilegeService.java    |   2 +-
 .../server/api/services/views/ViewService.java  |   2 +-
 .../services/views/ViewSubResourceService.java  |   2 +-
 .../api/services/views/ViewVersionService.java  |   2 +-
 .../apache/ambari/server/api/util/TreeNode.java |   2 +-
 .../ambari/server/api/util/TreeNodeImpl.java    |   2 +-
 .../ambari/server/audit/AsyncAuditLogger.java   |   2 +-
 .../apache/ambari/server/audit/AuditLogger.java |   2 +-
 .../server/audit/AuditLoggerDefaultImpl.java    |   2 +-
 .../ambari/server/audit/AuditLoggerModule.java  |   2 +-
 .../eventcreator/DefaultEventCreator.java       |   2 +-
 .../ambari/server/bootstrap/BSHostStatus.java   |   2 +-
 .../server/bootstrap/BSHostStatusCollector.java |   2 +-
 .../ambari/server/bootstrap/BSResponse.java     |   2 +-
 .../ambari/server/bootstrap/BSRunner.java       |   2 +-
 .../ambari/server/bootstrap/BootStrapImpl.java  |   2 +-
 .../server/bootstrap/BootStrapPostStatus.java   |   2 +-
 .../server/bootstrap/BootStrapStatus.java       |   2 +-
 .../DistributeRepositoriesStructuredOutput.java |   2 +-
 .../server/bootstrap/FifoLinkedHashMap.java     |   2 +-
 .../ambari/server/bootstrap/SshHostInfo.java    |   2 +-
 .../server/checks/AtlasPresenceCheck.java       |   2 +-
 .../ambari/server/checks/CheckDescription.java  |   2 +-
 .../server/checks/ConfigurationMergeCheck.java  |   2 +-
 .../checks/DatabaseConsistencyCheckHelper.java  |   4 +-
 .../HardcodedStackVersionPropertiesCheck.java   |   2 +-
 .../server/checks/RangerAuditDbCheck.java       |   2 +-
 .../server/checks/RangerSSLConfigCheck.java     |   2 +-
 .../server/checks/ServicePresenceCheck.java     |   2 +-
 .../ambari/server/checks/UpgradeCheck.java      |   2 +-
 .../ambari/server/checks/UpgradeCheckGroup.java |   2 +-
 .../server/checks/UpgradeCheckRegistry.java     |   2 +-
 .../server/checks/VersionMismatchCheck.java     |   2 +-
 .../server/cleanup/ClasspathScannerUtils.java   |   2 +-
 .../server/cleanup/TimeBasedCleanupPolicy.java  |   5 +-
 .../ComponentSSLConfiguration.java              |   2 +-
 .../AbstractRootServiceResponseFactory.java     |   2 +-
 .../controller/ActionExecutionContext.java      |   2 +-
 .../ambari/server/controller/ActionRequest.java |   2 +-
 .../server/controller/ActionRequestSwagger.java |   2 +-
 .../server/controller/ActionResponse.java       |   2 +-
 .../controller/ActiveWidgetLayoutRequest.java   |   2 +-
 .../controller/ActiveWidgetLayoutResponse.java  |   2 +-
 .../server/controller/AlertCurrentRequest.java  |   2 +-
 .../controller/AlertDefinitionResponse.java     |   2 +-
 .../server/controller/AlertHistoryRequest.java  |   2 +-
 .../server/controller/AlertNoticeRequest.java   |   2 +-
 .../controller/AmbariActionExecutionHelper.java |   2 +-
 .../AmbariCustomCommandExecutionHelper.java     |  21 +--
 .../server/controller/AmbariHandlerList.java    |   2 +-
 .../AmbariManagementControllerImpl.java         |  24 +--
 .../server/controller/AmbariSessionManager.java |   2 +-
 .../ambari/server/controller/ApiModel.java      |   2 +-
 .../server/controller/BlueprintSwagger.java     |   2 +-
 .../server/controller/ClusterRequest.java       |   2 +-
 .../controller/ComponentDependencyResponse.java |   2 +-
 .../server/controller/ConfigGroupRequest.java   |   2 +-
 .../server/controller/ConfigGroupResponse.java  |   2 +-
 .../server/controller/ConfigurationRequest.java |   2 +-
 .../controller/ConfigurationResponse.java       |   2 +-
 .../server/controller/ControllerRequest.java    |   2 +-
 .../server/controller/ControllerResponse.java   |   2 +-
 .../server/controller/ExecuteActionRequest.java |   2 +-
 .../server/controller/ExecuteCommandJson.java   |   6 +-
 .../server/controller/ExtensionLinkRequest.java |   2 +-
 .../controller/ExtensionLinkResponse.java       |   2 +-
 .../server/controller/ExtensionRequest.java     |   2 +-
 .../server/controller/ExtensionResponse.java    |   2 +-
 .../controller/ExtensionVersionRequest.java     |   2 +-
 .../controller/ExtensionVersionResponse.java    |   2 +-
 .../controller/GroupPrivilegeResponse.java      |   2 +-
 .../ambari/server/controller/GroupRequest.java  |   2 +-
 .../ambari/server/controller/GroupResponse.java |   2 +-
 .../HostComponentProcessResponse.java           |   2 +-
 .../ambari/server/controller/HostRequest.java   |   2 +-
 .../ambari/server/controller/HostResponse.java  |   2 +-
 .../ambari/server/controller/HostsMap.java      |   2 +-
 .../server/controller/KerberosHelperImpl.java   |   8 +-
 .../server/controller/LdapSyncRequest.java      |   2 +-
 .../controller/MaintenanceStateHelper.java      |   2 +-
 .../ambari/server/controller/MemberRequest.java |   2 +-
 .../server/controller/MemberResponse.java       |   2 +-
 .../controller/OperatingSystemRequest.java      |   2 +-
 .../controller/OperatingSystemResponse.java     |   2 +-
 .../server/controller/PrivilegeResponse.java    |   2 +-
 .../server/controller/QuickLinksResponse.java   |   2 +-
 .../server/controller/RepositoryRequest.java    |   2 +-
 .../server/controller/RepositoryResponse.java   |   2 +-
 .../server/controller/RequestPostRequest.java   |   2 +-
 .../server/controller/RequestPostResponse.java  |   2 +-
 .../server/controller/RequestPutRequest.java    |   2 +-
 .../server/controller/RequestRequest.java       |   2 +-
 .../server/controller/RequestResponse.java      |   2 +-
 .../controller/RequestScheduleRequest.java      |   2 +-
 .../controller/RequestScheduleResponse.java     |   2 +-
 .../controller/RequestStatusResponse.java       |   2 +-
 .../controller/ResourceProviderFactory.java     |   2 +-
 .../controller/RootServiceComponentRequest.java |   2 +-
 .../RootServiceComponentResponse.java           |   2 +-
 .../RootServiceHostComponentRequest.java        |   2 +-
 .../server/controller/RootServiceRequest.java   |   2 +-
 .../controller/RootServiceResponseFactory.java  |   2 +-
 .../controller/ServiceComponentHostRequest.java |   2 +-
 .../ServiceComponentHostResponse.java           |   2 +-
 .../controller/ServiceComponentRequest.java     |   2 +-
 .../controller/ServiceComponentResponse.java    |   2 +-
 .../server/controller/ServiceRequest.java       |   2 +-
 .../controller/ServiceRequestSwagger.java       |   2 +-
 .../server/controller/ServiceResponse.java      |   2 +-
 .../controller/StackArtifactResponse.java       |   2 +-
 .../StackConfigurationDependencyRequest.java    |   2 +-
 .../StackConfigurationDependencyResponse.java   |   2 +-
 .../controller/StackConfigurationRequest.java   |   2 +-
 .../controller/StackConfigurationResponse.java  |   2 +-
 .../StackLevelConfigurationRequest.java         |   2 +-
 .../StackLevelConfigurationResponse.java        |   2 +-
 .../ambari/server/controller/StackRequest.java  |   2 +-
 .../ambari/server/controller/StackResponse.java |   2 +-
 .../StackServiceArtifactResponse.java           |   2 +-
 .../StackServiceComponentRequest.java           |   2 +-
 .../StackServiceComponentResponse.java          |   2 +-
 .../server/controller/StackServiceRequest.java  |   2 +-
 .../server/controller/StackServiceResponse.java |   2 +-
 .../server/controller/StackVersionRequest.java  |   2 +-
 .../server/controller/StackVersionResponse.java |   2 +-
 .../ambari/server/controller/ThemeResponse.java |   2 +-
 .../controller/UserAuthorizationResponse.java   |   2 +-
 .../controller/UserPrivilegeResponse.java       |   2 +-
 .../ambari/server/controller/UserRequest.java   |   2 +-
 .../ambari/server/controller/UserResponse.java  |   2 +-
 .../server/controller/ViewInstanceRequest.java  |   2 +-
 .../server/controller/ViewInstanceResponse.java |   2 +-
 .../controller/ViewPermissionResponse.java      |   2 +-
 .../server/controller/ViewPrivilegeRequest.java |   2 +-
 .../controller/ViewPrivilegeResponse.java       |   2 +-
 .../ambari/server/controller/ViewResponse.java  |   2 +-
 .../server/controller/ViewVersionResponse.java  |   2 +-
 .../server/controller/WidgetResponse.java       |   2 +-
 .../AbstractControllerResourceProvider.java     |   2 +-
 .../internal/AbstractDRResourceProvider.java    |   2 +-
 .../internal/AbstractPropertyProvider.java      |   2 +-
 .../internal/AbstractProviderModule.java        |   2 +-
 .../internal/AbstractResourceProvider.java      |   2 +-
 .../internal/ActionResourceProvider.java        |   2 +-
 .../ActiveWidgetLayoutResourceProvider.java     |   2 +-
 .../internal/AlertHistoryResourceProvider.java  |   2 +-
 .../internal/AlertNoticeResourceProvider.java   |   2 +-
 .../internal/AlertResourceProvider.java         |   2 +-
 .../internal/AlertSummaryPropertyProvider.java  |   2 +-
 .../controller/internal/AppCookieManager.java   |   2 +-
 .../AtlasServerHttpPropertyRequest.java         |   4 +-
 .../controller/internal/BaseClusterRequest.java |   2 +-
 .../controller/internal/BaseProvider.java       |   2 +-
 .../BlueprintConfigurationProcessor.java        |   6 +-
 .../internal/BlueprintResourceProvider.java     |   2 +-
 .../controller/internal/CalculatedStatus.java   |   2 +-
 .../internal/ClientConfigResourceProvider.java  |   4 +-
 .../internal/ClusterControllerImpl.java         |   2 +-
 .../ClusterStackVersionResourceProvider.java    |   2 +-
 .../internal/CompatibleRepositoryVersion.java   |   2 +-
 ...atibleRepositoryVersionResourceProvider.java |   2 +-
 .../internal/ComponentResourceProvider.java     |   4 +-
 .../internal/ConfigGroupResourceProvider.java   |   2 +-
 .../ConfigurationTopologyException.java         |   2 +-
 .../internal/DefaultProviderModule.java         |   2 +-
 .../DefaultResourcePredicateEvaluator.java      |   2 +-
 .../internal/DefaultTrimmingStrategy.java       |   2 +-
 .../DeleteSpacesAtTheEndTrimmingStrategy.java   |   2 +-
 .../internal/DeleteStatusMetaData.java          |   2 +-
 .../internal/DirectoriesTrimmingStrategy.java   |   2 +-
 .../internal/ExportBlueprintRequest.java        |   2 +-
 .../server/controller/internal/Extension.java   |   2 +-
 .../internal/ExtensionLinkResourceProvider.java |   2 +-
 .../internal/ExtensionResourceProvider.java     |   2 +-
 .../ExtensionVersionResourceProvider.java       |   2 +-
 .../internal/FeedResourceProvider.java          |   2 +-
 .../internal/GroupResourceProvider.java         |   2 +-
 .../HostComponentProcessResourceProvider.java   |   2 +-
 .../internal/HostComponentResourceProvider.java |   2 +-
 .../HostStackVersionResourceProvider.java       |   2 +-
 .../internal/HttpPropertyProvider.java          |   2 +-
 .../internal/InstanceResourceProvider.java      |   2 +-
 .../internal/JobResourceProvider.java           |   2 +-
 .../internal/JsonHttpPropertyRequest.java       |   4 +-
 .../internal/LdapSyncEventResourceProvider.java |   2 +-
 .../internal/LoggingResourceProvider.java       |   2 +-
 .../internal/MemberResourceProvider.java        |   2 +-
 .../internal/ObservableResourceProvider.java    |   2 +-
 .../OperatingSystemResourceProvider.java        |   2 +-
 .../controller/internal/PageRequestImpl.java    |   2 +-
 .../controller/internal/PageResponseImpl.java   |   2 +-
 .../internal/PasswordTrimmingStrategy.java      |   2 +-
 .../internal/PermissionResourceProvider.java    |   2 +-
 .../PreUpgradeCheckResourceProvider.java        |   2 +-
 .../controller/internal/PropertyInfo.java       |   4 +-
 .../internal/PropertyPredicateVisitor.java      |   2 +-
 .../PropertyValueTrimmingStrategyDefiner.java   |   2 +-
 .../controller/internal/ProvisionAction.java    |   2 +-
 .../internal/ProvisionClusterRequest.java       |   2 +-
 .../internal/ReadOnlyResourceProvider.java      |   2 +-
 .../RecommendationResourceProvider.java         |   2 +-
 .../internal/RemoteClusterResourceProvider.java |   2 +-
 .../internal/RepositoryResourceProvider.java    |   2 +-
 .../RepositoryVersionResourceProvider.java      |   2 +-
 .../server/controller/internal/RequestImpl.java |   2 +-
 .../internal/RequestResourceFilter.java         |   2 +-
 .../RequestScheduleResourceProvider.java        |   2 +-
 .../internal/RequestStageContainer.java         |   2 +-
 .../controller/internal/RequestStatusImpl.java  |   2 +-
 .../controller/internal/ResourceImpl.java       |   2 +-
 .../ResourceManagerHttpPropertyRequest.java     |   2 +-
 .../internal/ResourceProviderEvent.java         |   2 +-
 .../internal/ResourceProviderObserver.java      |   2 +-
 .../RootServiceComponentResourceProvider.java   |   2 +-
 ...ootServiceHostComponentResourceProvider.java |   2 +-
 .../internal/RootServiceResourceProvider.java   |   2 +-
 .../internal/ScaleClusterRequest.java           |   2 +-
 .../server/controller/internal/SchemaImpl.java  |   2 +-
 .../internal/ServiceResourceProvider.java       |  12 +-
 .../internal/SimplifyingPredicateVisitor.java   |   2 +-
 .../controller/internal/SortRequestImpl.java    |   2 +-
 .../server/controller/internal/Stack.java       |   2 +-
 .../internal/StackAdvisorResourceProvider.java  |   2 +-
 .../internal/StackArtifactResourceProvider.java |   6 +-
 ...ConfigurationDependencyResourceProvider.java |   2 +-
 .../StackConfigurationResourceProvider.java     |   2 +-
 .../internal/StackDefinedPropertyProvider.java  |   2 +-
 .../StackDependencyResourceProvider.java        |   8 +-
 ...StackLevelConfigurationResourceProvider.java |   2 +-
 .../internal/StackResourceProvider.java         |   2 +-
 .../StackServiceComponentResourceProvider.java  |   2 +-
 .../internal/StackServiceResourceProvider.java  |   2 +-
 .../internal/StackVersionResourceProvider.java  |   2 +-
 .../internal/StageResourceProvider.java         |   2 +-
 .../internal/TargetClusterResourceProvider.java |   2 +-
 .../internal/TaskAttemptResourceProvider.java   |   2 +-
 .../internal/TaskResourceProvider.java          |   2 +-
 .../controller/internal/TemporalInfoImpl.java   |   2 +-
 .../controller/internal/TrimmingStrategy.java   |   2 +-
 .../controller/internal/URLStreamProvider.java  |   2 +-
 .../internal/UpgradeGroupResourceProvider.java  |   2 +-
 .../internal/UpgradeItemResourceProvider.java   |   2 +-
 .../internal/UpgradeResourceProvider.java       |  10 +-
 .../controller/internal/UpgradeSummary.java     |   4 +-
 .../UpgradeSummaryResourceProvider.java         |   4 +-
 .../internal/UserResourceProvider.java          |   2 +-
 .../internal/ValidationResourceProvider.java    |   4 +-
 .../internal/ViewInstanceResourceProvider.java  |   2 +-
 .../ViewPermissionResourceProvider.java         |   2 +-
 .../internal/ViewResourceProvider.java          |   2 +-
 .../internal/ViewURLResourceProvider.java       |   2 +-
 .../internal/ViewVersionResourceProvider.java   |   2 +-
 .../internal/WidgetLayoutResourceProvider.java  |   2 +-
 .../internal/WidgetResourceProvider.java        |   2 +-
 .../internal/WorkflowResourceProvider.java      |   2 +-
 .../ambari/server/controller/ivory/Cluster.java |   2 +-
 .../ambari/server/controller/ivory/Feed.java    |   2 +-
 .../server/controller/ivory/Instance.java       |   2 +-
 .../server/controller/ivory/IvoryService.java   |   2 +-
 .../controller/jdbc/ConnectionFactory.java      |   2 +-
 .../controller/jdbc/JDBCResourceProvider.java   |   2 +-
 .../JobHistoryPostgresConnectionFactory.java    |   2 +-
 .../controller/jdbc/SQLPredicateVisitor.java    |   2 +-
 .../server/controller/jmx/JMXHostProvider.java  |   2 +-
 .../server/controller/jmx/JMXMetricHolder.java  |   2 +-
 .../controller/jmx/JMXPropertyProvider.java     |   2 +-
 .../logging/HostComponentLoggingInfo.java       |   2 +-
 .../logging/LogFileDefinitionInfo.java          |   2 +-
 .../server/controller/logging/LogFileType.java  |   2 +-
 .../logging/LogLevelQueryResponse.java          |   2 +-
 .../controller/logging/LogLineResult.java       |   2 +-
 .../controller/logging/LogQueryResponse.java    |   2 +-
 .../logging/LogSearchDataRetrievalService.java  |   2 +-
 .../LoggingRequestHelperFactoryImpl.java        |   2 +-
 .../logging/LoggingRequestHelperImpl.java       |   2 +-
 .../logging/LoggingSearchPropertyProvider.java  |   2 +-
 .../controller/logging/NameValuePair.java       |   2 +-
 .../ambari/server/controller/logging/Utils.java |   2 +-
 .../controller/metrics/MetricHostProvider.java  |   2 +-
 .../metrics/MetricPropertyProviderFactory.java  |   2 +-
 .../metrics/MetricReportingAdapter.java         |   2 +-
 .../metrics/MetricsDataTransferMethod.java      |   2 +-
 .../MetricsDataTransferMethodFactory.java       |   2 +-
 .../metrics/MetricsDownsamplingMethod.java      |   2 +-
 .../MetricsDownsamplingMethodFactory.java       |   2 +-
 .../metrics/MetricsPaddingMethod.java           |   2 +-
 .../metrics/MetricsPropertyProvider.java        |   2 +-
 .../metrics/MetricsPropertyProviderProxy.java   |   2 +-
 .../metrics/MetricsReportPropertyProvider.java  |   2 +-
 .../MetricsReportPropertyProviderProxy.java     |   2 +-
 .../metrics/MetricsServiceProvider.java         |   2 +-
 .../metrics/RestMetricsPropertyProvider.java    |   2 +-
 .../ThreadPoolEnabledPropertyProvider.java      |   2 +-
 .../GangliaComponentPropertyProvider.java       |   2 +-
 .../GangliaHostComponentPropertyProvider.java   |   2 +-
 .../ganglia/GangliaHostPropertyProvider.java    |   2 +-
 .../metrics/ganglia/GangliaMetric.java          |   5 +-
 .../ganglia/GangliaPropertyProvider.java        |   2 +-
 .../ganglia/GangliaReportPropertyProvider.java  |   2 +-
 .../timeline/AMSComponentPropertyProvider.java  |   2 +-
 .../AMSHostComponentPropertyProvider.java       |   2 +-
 .../timeline/AMSHostPropertyProvider.java       |   2 +-
 .../metrics/timeline/AMSPropertyProvider.java   |   2 +-
 .../timeline/AMSReportPropertyProvider.java     |   2 +-
 .../metrics/timeline/MetricsRequestHelper.java  |   2 +-
 .../cache/TimelineAppMetricCacheKey.java        |   2 +-
 .../timeline/cache/TimelineMetricCache.java     |   2 +-
 .../cache/TimelineMetricCacheEntryFactory.java  |   2 +-
 .../cache/TimelineMetricCacheProvider.java      |   2 +-
 .../cache/TimelineMetricsCacheSizeOfEngine.java |   2 +-
 .../cache/TimelineMetricsCacheValue.java        |   2 +-
 .../controller/predicate/AlwaysPredicate.java   |   5 +-
 .../controller/predicate/AndPredicate.java      |   2 +-
 .../controller/predicate/ArrayPredicate.java    |   2 +-
 .../controller/predicate/BasePredicate.java     |   2 +-
 .../predicate/CategoryIsEmptyPredicate.java     |   2 +-
 .../controller/predicate/CategoryPredicate.java |   2 +-
 .../predicate/ComparisonPredicate.java          |   2 +-
 .../controller/predicate/EqualsPredicate.java   |   2 +-
 .../controller/predicate/FilterPredicate.java   |   2 +-
 .../predicate/GreaterEqualsPredicate.java       |   2 +-
 .../controller/predicate/GreaterPredicate.java  |   2 +-
 .../predicate/LessEqualsPredicate.java          |   2 +-
 .../controller/predicate/LessPredicate.java     |   2 +-
 .../controller/predicate/NotPredicate.java      |   2 +-
 .../controller/predicate/OrPredicate.java       |   2 +-
 .../controller/predicate/PredicateVisitor.java  |   2 +-
 .../predicate/PredicateVisitorAcceptor.java     |   2 +-
 .../controller/predicate/PropertyPredicate.java |   2 +-
 .../controller/predicate/UnaryPredicate.java    |   2 +-
 .../controller/spi/ClusterController.java       |   2 +-
 .../spi/NoSuchParentResourceException.java      |   2 +-
 .../controller/spi/NoSuchResourceException.java |   2 +-
 .../server/controller/spi/PageRequest.java      |   2 +-
 .../server/controller/spi/PageResponse.java     |   2 +-
 .../ambari/server/controller/spi/Predicate.java |   2 +-
 .../server/controller/spi/PropertyProvider.java |   2 +-
 .../server/controller/spi/ProviderModule.java   |   2 +-
 .../ambari/server/controller/spi/Request.java   |   2 +-
 .../server/controller/spi/RequestStatus.java    |   2 +-
 .../controller/spi/RequestStatusMetaData.java   |   2 +-
 .../ambari/server/controller/spi/Resource.java  |   2 +-
 .../spi/ResourceAlreadyExistsException.java     |   2 +-
 .../spi/ResourcePredicateEvaluator.java         |   2 +-
 .../server/controller/spi/ResourceProvider.java |   2 +-
 .../ambari/server/controller/spi/Schema.java    |   2 +-
 .../server/controller/spi/SchemaFactory.java    |   2 +-
 .../server/controller/spi/SortRequest.java      |   2 +-
 .../controller/spi/SortRequestProperty.java     |   2 +-
 .../server/controller/spi/SystemException.java  |   2 +-
 .../server/controller/spi/TemporalInfo.java     |   2 +-
 .../spi/UnsupportedPropertyException.java       |   2 +-
 ...eredThreadPoolExecutorCompletionService.java |   2 +-
 .../utilities/ClusterControllerHelper.java      |   2 +-
 .../controller/utilities/DatabaseChecker.java   |   2 +-
 .../controller/utilities/PredicateBuilder.java  |   2 +-
 .../controller/utilities/PredicateHelper.java   |   2 +-
 .../controller/utilities/PropertyHelper.java    |   2 +-
 .../utilities/ScalingThreadPoolExecutor.java    |   2 +-
 .../ServiceCalculatedStateFactory.java          |   2 +-
 .../controller/utilities/StreamProvider.java    |   2 +-
 .../state/DefaultServiceCalculatedState.java    |   2 +-
 .../state/FlumeServiceCalculatedState.java      |   4 +-
 .../state/HBaseServiceCalculatedState.java      |   2 +-
 .../state/HDFSServiceCalculatedState.java       |   2 +-
 .../state/HiveServiceCalculatedState.java       |   4 +-
 .../state/OozieServiceCalculatedState.java      |   2 +-
 .../utilities/state/ServiceCalculatedState.java |   2 +-
 .../state/YARNServiceCalculatedState.java       |   2 +-
 .../server/customactions/ActionDefinition.java  |   2 +-
 .../customactions/ActionDefinitionManager.java  |   2 +-
 .../customactions/ActionDefinitionSpec.java     |   2 +-
 .../customactions/ActionDefinitionXml.java      |   2 +-
 .../events/ActionFinalReportReceivedEvent.java  |   2 +-
 .../events/AggregateAlertRecalculateEvent.java  |   2 +-
 .../events/AlertDefinitionChangedEvent.java     |   2 +-
 .../events/AlertDefinitionDeleteEvent.java      |   2 +-
 .../events/AlertDefinitionDisabledEvent.java    |   2 +-
 .../AlertDefinitionRegistrationEvent.java       |   2 +-
 .../apache/ambari/server/events/AlertEvent.java |   2 +-
 .../events/AlertHashInvalidationEvent.java      |   2 +-
 .../server/events/AlertReceivedEvent.java       |   2 +-
 .../server/events/AlertStateChangeEvent.java    |   2 +-
 .../ambari/server/events/AmbariEvent.java       |   2 +-
 .../events/ClusterConfigChangedEvent.java       |   2 +-
 .../events/ClusterConfigFinishedEvent.java      |   2 +-
 .../ambari/server/events/ClusterEvent.java      |   2 +-
 .../HostComponentVersionAdvertisedEvent.java    |   2 +-
 .../apache/ambari/server/events/HostEvent.java  |   2 +-
 .../server/events/HostRegisteredEvent.java      |   2 +-
 .../ambari/server/events/HostsAddedEvent.java   |   2 +-
 .../ambari/server/events/HostsRemovedEvent.java |   2 +-
 .../ambari/server/events/InitialAlertEvent.java |   2 +-
 .../server/events/MaintenanceModeEvent.java     |   2 +-
 .../events/ServiceComponentInstalledEvent.java  |   2 +-
 .../ServiceComponentRecoveryChangedEvent.java   |   2 +-
 .../ServiceComponentUninstalledEvent.java       |   2 +-
 .../ambari/server/events/ServiceEvent.java      |   2 +-
 .../server/events/ServiceInstalledEvent.java    |   2 +-
 .../server/events/ServiceRemovedEvent.java      |   2 +-
 .../server/events/StackUpgradeFinishEvent.java  |   4 +-
 .../ambari/server/events/TaskCreateEvent.java   |   4 +-
 .../apache/ambari/server/events/TaskEvent.java  |   4 +-
 .../ambari/server/events/TaskUpdateEvent.java   |   4 +-
 .../EntityManagerCacheInvalidationEvent.java    |   2 +-
 .../ambari/server/events/jpa/JPAEvent.java      |   2 +-
 .../alerts/AlertAggregateListener.java          |   2 +-
 .../alerts/AlertDefinitionDisabledListener.java |   2 +-
 .../alerts/AlertHashInvalidationListener.java   |   2 +-
 .../listeners/alerts/AlertHostListener.java     |   2 +-
 .../alerts/AlertLifecycleListener.java          |   2 +-
 .../alerts/AlertMaintenanceModeListener.java    |   2 +-
 .../listeners/alerts/AlertReceivedListener.java |   2 +-
 .../AlertServiceComponentHostListener.java      |   2 +-
 .../alerts/AlertServiceStateListener.java       |   2 +-
 .../alerts/AlertStateChangedListener.java       |   2 +-
 .../listeners/tasks/TaskStatusListener.java     |   3 +-
 .../DistributeRepositoriesActionListener.java   |   2 +-
 .../upgrade/HostVersionOutOfSyncListener.java   |   2 +-
 .../upgrade/StackUpgradeFinishListener.java     |   2 +-
 .../listeners/upgrade/StackVersionListener.java |   2 +-
 .../events/publishers/AlertEventPublisher.java  |   2 +-
 .../events/publishers/AmbariEventPublisher.java |   2 +-
 .../events/publishers/JPAEventPublisher.java    |   2 +-
 .../events/publishers/TaskEventPublisher.java   |   2 +-
 .../publishers/VersionEventPublisher.java       |   2 +-
 .../ambari/server/hooks/AmbariEventFactory.java |   2 +-
 .../apache/ambari/server/hooks/HookContext.java |   2 +-
 .../ambari/server/hooks/HookContextFactory.java |   2 +-
 .../apache/ambari/server/hooks/HookService.java |   2 +-
 .../users/PostUserCreationHookContext.java      |   2 +-
 .../server/hooks/users/UserCreatedEvent.java    |   2 +-
 .../server/hooks/users/UserHookParams.java      |   2 +-
 .../server/hooks/users/UserHookService.java     |   2 +-
 .../server/logging/EclipseLinkLogger.java       |   2 +-
 .../metadata/AmbariServiceAlertDefinitions.java |   2 +-
 .../CachedRoleCommandOrderProvider.java         |   2 +-
 .../server/metadata/RoleCommandOrder.java       |   2 +-
 .../metadata/RoleCommandOrderProvider.java      |   2 +-
 .../ambari/server/metadata/RoleCommandPair.java |   2 +-
 .../server/metrics/system/MetricsService.java   |   2 +-
 .../server/metrics/system/MetricsSink.java      |   2 +-
 .../server/metrics/system/MetricsSource.java    |   4 +-
 .../server/metrics/system/SingleMetric.java     |   2 +-
 .../system/impl/AbstractMetricsSource.java      |   4 +-
 .../system/impl/AmbariMetricSinkImpl.java       |   2 +-
 .../system/impl/AmbariPerformanceMonitor.java   |   2 +-
 .../system/impl/DatabaseMetricsSource.java      |   4 +-
 .../metrics/system/impl/JvmMetricsSource.java   |   2 +-
 .../system/impl/MetricsConfiguration.java       |   2 +-
 .../metrics/system/impl/MetricsServiceImpl.java |   2 +-
 .../server/notifications/DispatchCallback.java  |   2 +-
 .../notifications/DispatchCredentials.java      |   2 +-
 .../server/notifications/DispatchFactory.java   |   2 +-
 .../server/notifications/DispatchRunnable.java  |   4 +-
 .../server/notifications/Notification.java      |   2 +-
 .../notifications/NotificationDispatcher.java   |   2 +-
 .../ambari/server/notifications/Recipient.java  |   2 +-
 .../TargetConfigurationResult.java              |   4 +-
 .../dispatchers/AlertScriptDispatcher.java      |   2 +-
 .../dispatchers/AmbariSNMPDispatcher.java       |   2 +-
 .../dispatchers/EmailDispatcher.java            |   2 +-
 .../dispatchers/SNMPDispatcher.java             |   2 +-
 .../orm/AmbariLocalSessionInterceptor.java      |   2 +-
 .../ambari/server/orm/DBAccessorImpl.java       |   2 +-
 .../orm/EclipseLinkSessionCustomizer.java       |   2 +-
 .../ambari/server/orm/GuiceJpaInitializer.java  |   2 +-
 .../ambari/server/orm/PersistenceType.java      |   2 +-
 .../ambari/server/orm/TransactionalLocks.java   |   4 +-
 .../orm/cache/ConfigGroupHostMapping.java       |   2 +-
 .../orm/cache/ConfigGroupHostMappingImpl.java   |   2 +-
 .../server/orm/cache/HostConfigMapping.java     |   2 +-
 .../server/orm/cache/HostConfigMappingImpl.java |   2 +-
 .../server/orm/dao/AlertDefinitionDAO.java      |   2 +-
 .../ambari/server/orm/dao/AlertDispatchDAO.java |   2 +-
 .../server/orm/dao/AlertHostSummaryDTO.java     |   2 +-
 .../ambari/server/orm/dao/AlertSummaryDTO.java  |   2 +-
 .../apache/ambari/server/orm/dao/AlertsDAO.java |   2 +-
 .../ambari/server/orm/dao/ArtifactDAO.java      |   2 +-
 .../ambari/server/orm/dao/BlueprintDAO.java     |   2 +-
 .../ambari/server/orm/dao/ClusterDAO.java       |   2 +-
 .../server/orm/dao/ClusterServiceDAO.java       |   2 +-
 .../ambari/server/orm/dao/ClusterStateDAO.java  |   2 +-
 .../orm/dao/ConfigGroupConfigMappingDAO.java    |   2 +-
 .../ambari/server/orm/dao/ConfigGroupDAO.java   |   2 +-
 .../orm/dao/ConfigGroupHostMappingDAO.java      |   2 +-
 .../apache/ambari/server/orm/dao/CrudDAO.java   |   2 +-
 .../ambari/server/orm/dao/ExtensionDAO.java     |   2 +-
 .../ambari/server/orm/dao/ExtensionLinkDAO.java |   2 +-
 .../apache/ambari/server/orm/dao/GroupDAO.java  |   2 +-
 .../server/orm/dao/HostAlertSummaryDTO.java     |   2 +-
 .../orm/dao/HostComponentDesiredStateDAO.java   |   2 +-
 .../server/orm/dao/HostComponentStateDAO.java   |   2 +-
 .../server/orm/dao/HostConfigMappingDAO.java    |   2 +-
 .../apache/ambari/server/orm/dao/HostDAO.java   |   2 +-
 .../dao/HostRoleCommandStatusSummaryDTO.java    |   2 +-
 .../ambari/server/orm/dao/HostStateDAO.java     |   2 +-
 .../ambari/server/orm/dao/HostVersionDAO.java   |   2 +-
 .../server/orm/dao/KerberosDescriptorDAO.java   |  34 ++--
 .../apache/ambari/server/orm/dao/MemberDAO.java |   2 +-
 .../ambari/server/orm/dao/PrivilegeDAO.java     |   2 +-
 .../server/orm/dao/RemoteAmbariClusterDAO.java  |   2 +-
 .../server/orm/dao/RepositoryVersionDAO.java    |   2 +-
 .../orm/dao/RequestOperationLevelDAO.java       |   2 +-
 .../orm/dao/RequestScheduleBatchRequestDAO.java |   2 +-
 .../server/orm/dao/RequestScheduleDAO.java      |   2 +-
 .../ambari/server/orm/dao/ResourceDAO.java      |   2 +-
 .../ambari/server/orm/dao/ResourceTypeDAO.java  |   2 +-
 .../dao/ServiceComponentDesiredStateDAO.java    |   2 +-
 .../server/orm/dao/ServiceDesiredStateDAO.java  |   2 +-
 .../ambari/server/orm/dao/SettingDAO.java       |   2 +-
 .../apache/ambari/server/orm/dao/StackDAO.java  |   2 +-
 .../server/orm/dao/TopologyHostGroupDAO.java    |   2 +-
 .../server/orm/dao/TopologyHostRequestDAO.java  |   2 +-
 .../server/orm/dao/TopologyHostTaskDAO.java     |   2 +-
 .../orm/dao/TopologyLogicalRequestDAO.java      |   2 +-
 .../server/orm/dao/TopologyLogicalTaskDAO.java  |   2 +-
 .../server/orm/dao/TopologyRequestDAO.java      |   2 +-
 .../ambari/server/orm/dao/UpgradeDAO.java       |   2 +-
 .../apache/ambari/server/orm/dao/UserDAO.java   |   2 +-
 .../apache/ambari/server/orm/dao/ViewDAO.java   |   2 +-
 .../ambari/server/orm/dao/ViewInstanceDAO.java  |   2 +-
 .../ambari/server/orm/dao/ViewURLDAO.java       |   2 +-
 .../apache/ambari/server/orm/dao/WidgetDAO.java |   2 +-
 .../ambari/server/orm/dao/WidgetLayoutDAO.java  |   2 +-
 .../server/orm/entities/AlertCurrentEntity.java |   2 +-
 .../orm/entities/AlertDefinitionEntity.java     |   2 +-
 .../server/orm/entities/AlertGroupEntity.java   |   4 +-
 .../server/orm/entities/AlertHistoryEntity.java |   4 +-
 .../server/orm/entities/AlertNoticeEntity.java  |   2 +-
 .../server/orm/entities/AlertTargetEntity.java  |   4 +-
 .../server/orm/entities/ArtifactEntity.java     |   2 +-
 .../server/orm/entities/ArtifactEntityPK.java   |   2 +-
 .../orm/entities/BlueprintConfigEntity.java     |   2 +-
 .../orm/entities/BlueprintConfigEntityPK.java   |   2 +-
 .../server/orm/entities/BlueprintEntity.java    |   2 +-
 .../orm/entities/BlueprintSettingEntity.java    |   2 +-
 .../orm/entities/ClusterConfigEntity.java       |   2 +-
 .../server/orm/entities/ClusterEntity.java      |   8 +-
 .../orm/entities/ClusterServiceEntity.java      |   2 +-
 .../orm/entities/ClusterServiceEntityPK.java    |   2 +-
 .../server/orm/entities/ClusterStateEntity.java |   2 +-
 .../ConfigGroupConfigMappingEntity.java         |   2 +-
 .../ConfigGroupConfigMappingEntityPK.java       |   2 +-
 .../server/orm/entities/ConfigGroupEntity.java  |   2 +-
 .../entities/ConfigGroupHostMappingEntity.java  |   2 +-
 .../ConfigGroupHostMappingEntityPK.java         |   2 +-
 .../server/orm/entities/ExtensionEntity.java    |   2 +-
 .../orm/entities/ExtensionLinkEntity.java       |   2 +-
 .../ambari/server/orm/entities/GroupEntity.java |   2 +-
 .../HostComponentDesiredStateEntity.java        |   2 +-
 .../orm/entities/HostComponentStateEntity.java  |   2 +-
 .../ambari/server/orm/entities/HostEntity.java  |   2 +-
 .../ambari/server/orm/entities/HostEntity_.java |   4 +-
 .../orm/entities/HostGroupComponentEntity.java  |   2 +-
 .../entities/HostGroupComponentEntityPK.java    |   2 +-
 .../orm/entities/HostGroupConfigEntity.java     |   2 +-
 .../orm/entities/HostGroupConfigEntityPK.java   |   2 +-
 .../server/orm/entities/HostGroupEntity.java    |   2 +-
 .../server/orm/entities/HostGroupEntityPK.java  |   2 +-
 .../server/orm/entities/HostStateEntity.java    |   2 +-
 .../server/orm/entities/HostVersionEntity.java  |   2 +-
 .../orm/entities/LdapSyncEventEntity.java       |   2 +-
 .../server/orm/entities/LdapSyncSpecEntity.java |   2 +-
 .../server/orm/entities/MemberEntity.java       |   2 +-
 .../orm/entities/OperatingSystemEntity.java     |   2 +-
 .../server/orm/entities/PrincipalEntity.java    |   2 +-
 .../orm/entities/RemoteAmbariClusterEntity.java |   2 +-
 .../RemoteAmbariClusterServiceEntity.java       |   2 +-
 .../server/orm/entities/RepositoryEntity.java   |   2 +-
 .../orm/entities/RepositoryVersionEntity.java   |   2 +-
 .../RequestScheduleBatchRequestEntity.java      |   2 +-
 .../RequestScheduleBatchRequestEntityPK.java    |   2 +-
 .../orm/entities/RequestScheduleEntity.java     |   2 +-
 .../server/orm/entities/ResourceEntity.java     |   2 +-
 .../server/orm/entities/ResourceTypeEntity.java |   2 +-
 .../ServiceComponentDesiredStateEntity.java     |   2 +-
 .../entities/ServiceComponentVersionEntity.java |   2 +-
 .../orm/entities/ServiceDesiredStateEntity.java |   2 +-
 .../entities/ServiceDesiredStateEntityPK.java   |   2 +-
 .../server/orm/entities/SettingEntity.java      |   2 +-
 .../orm/entities/TopologyHostGroupEntity.java   |   2 +-
 .../orm/entities/TopologyHostInfoEntity.java    |   2 +-
 .../orm/entities/TopologyHostRequestEntity.java |   2 +-
 .../orm/entities/TopologyHostTaskEntity.java    |   2 +-
 .../entities/TopologyLogicalRequestEntity.java  |   2 +-
 .../orm/entities/TopologyLogicalTaskEntity.java |   2 +-
 .../orm/entities/TopologyRequestEntity.java     |   2 +-
 .../server/orm/entities/UpgradeEntity.java      |   2 +-
 .../server/orm/entities/UpgradeGroupEntity.java |   2 +-
 .../server/orm/entities/UpgradeItemEntity.java  |   2 +-
 .../ambari/server/orm/entities/UserEntity.java  |   2 +-
 .../ambari/server/orm/entities/ViewEntity.java  |   2 +-
 .../server/orm/entities/ViewEntityEntity.java   |   2 +-
 .../orm/entities/ViewInstanceDataEntity.java    |   2 +-
 .../orm/entities/ViewInstanceDataEntityPK.java  |   2 +-
 .../server/orm/entities/ViewInstanceEntity.java |   2 +-
 .../entities/ViewInstancePropertyEntity.java    |   2 +-
 .../entities/ViewInstancePropertyEntityPK.java  |   2 +-
 .../orm/entities/ViewParameterEntity.java       |   2 +-
 .../orm/entities/ViewParameterEntityPK.java     |   2 +-
 .../server/orm/entities/ViewResourceEntity.java |   2 +-
 .../orm/entities/ViewResourceEntityPK.java      |   2 +-
 .../server/orm/entities/ViewURLEntity.java      |   2 +-
 .../server/orm/entities/WidgetEntity.java       |   2 +-
 .../server/orm/entities/WidgetLayoutEntity.java |   4 +-
 .../entities/WidgetLayoutUserWidgetEntity.java  |   4 +-
 .../WidgetLayoutUserWidgetEntityPK.java         |   4 +-
 .../ambari/server/orm/helpers/ScriptRunner.java |  10 +-
 .../server/orm/helpers/dbms/H2Helper.java       |   2 +-
 .../server/orm/models/HostComponentSummary.java |   2 +-
 .../ambari/server/proxy/ProxyService.java       |   2 +-
 .../server/resources/ResourceManager.java       |   2 +-
 .../server/resources/api/rest/GetResource.java  |   2 +-
 .../scheduler/AbstractLinearExecutionJob.java   |   2 +-
 .../ambari/server/scheduler/ExecutionJob.java   |   2 +-
 .../scheduler/ExecutionScheduleManager.java     |   6 +-
 .../server/scheduler/ExecutionScheduler.java    |   2 +-
 .../scheduler/ExecutionSchedulerImpl.java       |   2 +-
 .../server/security/CertificateManager.java     |   2 +-
 .../server/security/ClientSecurityType.java     |   2 +-
 .../ambari/server/security/SecurityFilter.java  |   2 +-
 .../ambari/server/security/SecurityHelper.java  |   2 +-
 .../server/security/SecurityHelperImpl.java     |   2 +-
 .../server/security/SignCertResponse.java       |   2 +-
 .../ambari/server/security/SignMessage.java     |   2 +-
 .../authorization/AmbariAuthentication.java     |   2 +-
 .../authorization/AmbariGrantedAuthority.java   |   2 +-
 .../AmbariLdapAuthoritiesPopulator.java         |   2 +-
 .../authorization/AmbariLocalUserProvider.java  |   2 +-
 .../AmbariPamAuthenticationProvider.java        |   2 +-
 .../authorization/AmbariUserAuthentication.java |   2 +-
 .../AmbariUserAuthorizationFilter.java          |   2 +-
 ...ateLdapUserFoundAuthenticationException.java |   2 +-
 .../security/authorization/GroupType.java       |   2 +-
 .../authorization/LdapServerProperties.java     |   2 +-
 .../PamAuthenticationException.java             |   2 +-
 .../authorization/UserIdAuthentication.java     |   2 +-
 .../server/security/authorization/UserType.java |   2 +-
 .../InternalAuthenticationInterceptor.java      |   2 +-
 .../internal/InternalTokenStorage.java          |   2 +-
 .../RunWithInternalSecurityContext.java         |   2 +-
 .../security/encryption/AESEncryptor.java       |  26 +--
 .../encryption/AbstractCredentialStore.java     |   4 +-
 .../security/encryption/CredentialProvider.java |   2 +-
 .../security/encryption/EncryptionResult.java   |   2 +-
 .../security/encryption/MasterKeyService.java   |   2 +-
 .../encryption/MasterKeyServiceImpl.java        |  10 +-
 .../server/security/ldap/LdapBatchDto.java      |   2 +-
 .../server/security/ldap/LdapGroupDto.java      |   2 +-
 .../server/security/ldap/LdapSyncDto.java       |   2 +-
 .../server/security/ldap/LdapUserDto.java       |   2 +-
 .../security/ldap/LdapUserGroupMemberDto.java   |   2 +-
 .../unsecured/rest/CertificateDownload.java     |   2 +-
 .../unsecured/rest/CertificateSign.java         |   2 +-
 .../security/unsecured/rest/ConnectionInfo.java |   2 +-
 .../server/serveraction/ServerAction.java       |   2 +-
 .../kerberos/ADKerberosOperationHandler.java    |   5 +-
 .../kerberos/IPAKerberosOperationHandler.java   |   8 +-
 .../kerberos/KerberosOperationHandler.java      |   6 -
 .../upgrades/AbstractUpgradeServerAction.java   |   2 +-
 .../upgrades/AutoSkipFailedSummaryAction.java   |   2 +-
 .../upgrades/ComponentVersionCheckAction.java   |   2 +-
 .../serveraction/upgrades/ConfigureAction.java  |   2 +-
 .../upgrades/FinalizeUpgradeAction.java         |   2 +-
 .../FixCapacitySchedulerOrderingPolicy.java     |   2 +-
 .../upgrades/FixYarnWebServiceUrl.java          |   2 +-
 .../upgrades/HiveZKQuorumConfigAction.java      |   2 +-
 .../upgrades/KerberosKeytabsAction.java         |   2 +-
 .../upgrades/ManualStageAction.java             |   2 +-
 .../upgrades/RangerConfigCalculation.java       |   2 +-
 .../RangerKerberosConfigCalculation.java        |   4 +-
 .../upgrades/RangerKmsProxyConfig.java          |   2 +-
 .../upgrades/RangerWebAlertConfigAction.java    |   2 +-
 .../upgrades/UpdateDesiredStackAction.java      |   2 +-
 .../upgrades/ZooKeeperQuorumCalculator.java     |   2 +-
 .../users/CollectionPersisterService.java       |   2 +-
 .../CollectionPersisterServiceFactory.java      |   2 +-
 .../users/CsvFilePersisterService.java          |   2 +-
 .../users/PostUserCreationHookServerAction.java |   2 +-
 .../users/ShellCommandCallableFactory.java      |   2 +-
 .../users/ShellCommandUtilityCallable.java      |   2 +-
 .../users/ShellCommandUtilityWrapper.java       |   2 +-
 .../apache/ambari/server/stack/BaseModule.java  |   2 +-
 .../server/stack/CommonServiceDirectory.java    |  10 +-
 .../ambari/server/stack/ComponentModule.java    |   2 +-
 .../server/stack/ConfigurationDirectory.java    |   2 +-
 .../ambari/server/stack/ConfigurationInfo.java  |   2 +-
 .../server/stack/ConfigurationModule.java       |   2 +-
 .../ambari/server/stack/ExtensionDirectory.java |   2 +-
 .../ambari/server/stack/ExtensionHelper.java    |   2 +-
 .../ambari/server/stack/ExtensionModule.java    |   2 +-
 .../apache/ambari/server/stack/HostsType.java   |   2 +-
 .../ambari/server/stack/MasterHostResolver.java |   2 +-
 .../server/stack/ModuleFileUnmarshaller.java    |   6 +-
 .../apache/ambari/server/stack/ModuleState.java |   2 +-
 .../server/stack/NoSuchStackException.java      |   2 +-
 .../stack/QuickLinksConfigurationModule.java    |   2 +-
 .../apache/ambari/server/stack/RepoUtil.java    |   2 +-
 .../ambari/server/stack/ServiceDirectory.java   |   2 +-
 .../ambari/server/stack/ServiceModule.java      |   4 +-
 .../ambari/server/stack/StackContext.java       |   2 +-
 .../server/stack/StackDefinitionDirectory.java  |   2 +-
 .../server/stack/StackDefinitionModule.java     |   2 +-
 .../ambari/server/stack/StackDirectory.java     |   2 +-
 .../ambari/server/stack/StackManager.java       |   2 +-
 .../server/stack/StackManagerFactory.java       |   2 +-
 .../apache/ambari/server/stack/StackModule.java |   2 +-
 .../server/stack/StackServiceDirectory.java     |  11 +-
 .../apache/ambari/server/stack/ThemeModule.java |   2 +-
 .../stack/UpdateActiveRepoVersionOnStartup.java |   2 +-
 .../apache/ambari/server/stack/Validable.java   |   2 +-
 .../ambari/server/stageplanner/RoleGraph.java   |   2 +-
 .../server/stageplanner/RoleGraphFactory.java   |   2 +-
 .../server/stageplanner/RoleGraphNode.java      |   2 +-
 .../ambari/server/state/AgentVersion.java       |   2 +-
 .../org/apache/ambari/server/state/Alert.java   |   2 +-
 .../ambari/server/state/AlertFirmness.java      |   2 +-
 .../apache/ambari/server/state/AlertState.java  |   2 +-
 .../ambari/server/state/AutoDeployInfo.java     |   2 +-
 .../server/state/BulkCommandDefinition.java     |   2 +-
 .../ambari/server/state/ChangedConfigInfo.java  |   2 +-
 .../state/ClientConfigFileDefinition.java       |   2 +-
 .../org/apache/ambari/server/state/Cluster.java |   2 +-
 .../server/state/ClusterHealthReport.java       |   2 +-
 .../apache/ambari/server/state/Clusters.java    |   2 +-
 .../server/state/CommandScriptDefinition.java   |   2 +-
 .../org/apache/ambari/server/state/Config.java  |   2 +-
 .../ambari/server/state/ConfigFactory.java      |   2 +-
 .../ambari/server/state/ConfigHelper.java       |   2 +-
 .../apache/ambari/server/state/ConfigImpl.java  |   2 +-
 .../ambari/server/state/ConfigMergeHelper.java  |   2 +-
 .../server/state/CredentialStoreInfo.java       |   2 +-
 .../server/state/CustomCommandDefinition.java   |   2 +-
 .../server/state/DependencyConditionInfo.java   |   2 +-
 .../ambari/server/state/DependencyInfo.java     |   2 +-
 .../apache/ambari/server/state/ExtensionId.java |   2 +-
 .../ambari/server/state/ExtensionInfo.java      |   2 +-
 .../org/apache/ambari/server/state/Host.java    |   2 +-
 .../server/state/HostComponentAdminState.java   |   2 +-
 .../apache/ambari/server/state/HostEvent.java   |   2 +-
 .../ambari/server/state/HostEventType.java      |   2 +-
 .../ambari/server/state/HostHealthStatus.java   |   2 +-
 .../apache/ambari/server/state/HostState.java   |   2 +-
 .../ambari/server/state/LogDefinition.java      |   2 +-
 .../ambari/server/state/MaintenanceState.java   |   2 +-
 .../ambari/server/state/NotificationState.java  |   2 +-
 .../server/state/OperatingSystemInfo.java       |   2 +-
 .../server/state/PropertyDependencyInfo.java    |   2 +-
 .../ambari/server/state/PropertyInfo.java       |   2 +-
 .../state/PropertyStackUpgradeBehavior.java     |   2 +-
 .../server/state/PropertyUpgradeBehavior.java   |   2 +-
 .../state/QuickLinksConfigurationInfo.java      |   2 +-
 .../ambari/server/state/RepositoryInfo.java     |   2 +-
 .../ambari/server/state/RepositoryType.java     |   2 +-
 .../server/state/RepositoryVersionState.java    |   2 +-
 .../org/apache/ambari/server/state/Service.java |   2 +-
 .../ambari/server/state/ServiceComponent.java   |   2 +-
 .../server/state/ServiceComponentFactory.java   |   5 +-
 .../server/state/ServiceComponentHost.java      |   2 +-
 .../server/state/ServiceComponentHostEvent.java |   2 +-
 .../state/ServiceComponentHostEventType.java    |   2 +-
 .../state/ServiceComponentHostFactory.java      |   2 +-
 .../server/state/ServiceComponentImpl.java      |   2 +-
 .../ambari/server/state/ServiceFactory.java     |   2 +-
 .../apache/ambari/server/state/ServiceImpl.java |   2 +-
 .../apache/ambari/server/state/ServiceInfo.java |   2 +-
 .../ambari/server/state/ServiceOsSpecific.java  |   2 +-
 .../server/state/ServicePropertyInfo.java       |   2 +-
 .../org/apache/ambari/server/state/StackId.java |   2 +-
 .../apache/ambari/server/state/StackInfo.java   |   2 +-
 .../org/apache/ambari/server/state/State.java   |   2 +-
 .../apache/ambari/server/state/ThemeInfo.java   |   2 +-
 .../ambari/server/state/UpgradeContext.java     |   2 +-
 .../server/state/UpgradeContextFactory.java     |   2 +-
 .../ambari/server/state/UpgradeHelper.java      |   2 +-
 .../ambari/server/state/UpgradeState.java       |   2 +-
 .../server/state/ValueAttributesInfo.java       |   2 +-
 .../ambari/server/state/action/Action.java      |   2 +-
 .../state/action/ActionCompletedEvent.java      |   2 +-
 .../ambari/server/state/action/ActionEvent.java |   2 +-
 .../server/state/action/ActionEventType.java    |   2 +-
 .../server/state/action/ActionFailedEvent.java  |   2 +-
 .../ambari/server/state/action/ActionId.java    |   2 +-
 .../ambari/server/state/action/ActionImpl.java  |   2 +-
 .../server/state/action/ActionInitEvent.java    |   2 +-
 .../state/action/ActionProgressUpdateEvent.java |   2 +-
 .../ambari/server/state/action/ActionState.java |   2 +-
 .../ambari/server/state/action/ActionType.java  |   2 +-
 .../state/alert/AggregateDefinitionMapping.java |   2 +-
 .../server/state/alert/AggregateSource.java     |   2 +-
 .../server/state/alert/AlertDefinition.java     |   2 +-
 .../state/alert/AlertDefinitionFactory.java     |   2 +-
 .../server/state/alert/AlertDefinitionHash.java |   2 +-
 .../ambari/server/state/alert/AlertGroup.java   |   2 +-
 .../server/state/alert/AlertNotification.java   |   2 +-
 .../ambari/server/state/alert/AlertTarget.java  |   2 +-
 .../ambari/server/state/alert/AlertUri.java     |   2 +-
 .../ambari/server/state/alert/AmsSource.java    |   2 +-
 .../ambari/server/state/alert/MetricSource.java |   2 +-
 .../server/state/alert/ParameterizedSource.java |   2 +-
 .../server/state/alert/PercentSource.java       |   2 +-
 .../ambari/server/state/alert/PortSource.java   |   2 +-
 .../server/state/alert/RecoverySource.java      |   2 +-
 .../ambari/server/state/alert/Reporting.java    |   2 +-
 .../apache/ambari/server/state/alert/Scope.java |   2 +-
 .../ambari/server/state/alert/ScriptSource.java |   2 +-
 .../ambari/server/state/alert/ServerSource.java |   2 +-
 .../ambari/server/state/alert/Source.java       |   2 +-
 .../ambari/server/state/alert/SourceType.java   |   2 +-
 .../ambari/server/state/alert/TargetType.java   |   2 +-
 .../ambari/server/state/alert/WebSource.java    |   2 +-
 .../server/state/cluster/ClusterFactory.java    |   2 +-
 .../server/state/cluster/ClusterImpl.java       |   4 +-
 .../server/state/cluster/ClustersImpl.java      |   2 +-
 .../server/state/configgroup/ConfigGroup.java   |   2 +-
 .../state/configgroup/ConfigGroupFactory.java   |   2 +-
 .../state/configgroup/ConfigGroupImpl.java      |   2 +-
 .../fsm/InvalidStateTransitionException.java    |   2 +-
 .../server/state/fsm/MultipleArcTransition.java |   2 +-
 .../server/state/fsm/SingleArcTransition.java   |   2 +-
 .../ambari/server/state/fsm/StateMachine.java   |   2 +-
 .../server/state/fsm/StateMachineFactory.java   |   2 +-
 .../server/state/fsm/event/AbstractEvent.java   |   2 +-
 .../ambari/server/state/fsm/event/Event.java    |   2 +-
 .../server/state/fsm/event/EventHandler.java    |   2 +-
 .../ambari/server/state/host/HostFactory.java   |   2 +-
 .../state/host/HostHealthyHeartbeatEvent.java   |   2 +-
 .../state/host/HostHeartbeatLostEvent.java      |   2 +-
 .../ambari/server/state/host/HostImpl.java      |   2 +-
 .../host/HostRegistrationRequestEvent.java      |   2 +-
 .../host/HostStatusUpdatesReceivedEvent.java    |   2 +-
 .../state/host/HostUnhealthyHeartbeatEvent.java |   2 +-
 .../kerberos/AbstractKerberosDescriptor.java    |   2 +-
 .../kerberos/KerberosComponentDescriptor.java   |   2 +-
 .../kerberos/KerberosIdentityDescriptor.java    |   2 +-
 .../kerberos/KerberosPrincipalDescriptor.java   |   2 +-
 .../kerberos/KerberosServiceDescriptor.java     |   2 +-
 .../server/state/quicklinksprofile/Filter.java  |   4 +-
 .../state/repository/AvailableService.java      |   2 +-
 .../repository/AvailableServiceReference.java   |   2 +-
 .../state/repository/AvailableVersion.java      |   2 +-
 .../state/repository/ManifestService.java       |   2 +-
 .../state/repository/ManifestServiceInfo.java   |   2 +-
 .../ambari/server/state/repository/Release.java |   2 +-
 .../state/repository/VersionDefinitionXml.java  |   2 +-
 .../server/state/repository/package-info.java   |   2 +-
 .../ambari/server/state/scheduler/Batch.java    |   2 +-
 .../server/state/scheduler/BatchRequest.java    |   2 +-
 .../server/state/scheduler/BatchRequestJob.java |   2 +-
 .../state/scheduler/BatchRequestResponse.java   |   2 +-
 .../server/state/scheduler/BatchSettings.java   |   2 +-
 .../state/scheduler/RequestExecution.java       |   2 +-
 .../scheduler/RequestExecutionFactory.java      |   2 +-
 .../state/scheduler/RequestExecutionImpl.java   |   2 +-
 .../ambari/server/state/scheduler/Schedule.java |   2 +-
 .../services/AlertNoticeDispatchService.java    |   2 +-
 .../services/AmbariServerAlertService.java      |   2 +-
 .../state/services/CachedAlertFlushService.java |   4 +-
 .../state/services/MetricsRetrievalService.java |   2 +-
 .../services/RetryUpgradeActionService.java     |   2 +-
 .../server/state/stack/ConfigUpgradePack.java   |   2 +-
 .../server/state/stack/ConfigurationXml.java    |   2 +-
 .../state/stack/ExtensionMetainfoXml.java       |   2 +-
 .../server/state/stack/JsonOsFamilyEntry.java   |   2 +-
 .../server/state/stack/JsonOsFamilyRoot.java    |   2 +-
 .../server/state/stack/LatestRepoCallable.java  |   2 +-
 .../ambari/server/state/stack/Metric.java       |   4 +-
 .../server/state/stack/MetricDefinition.java    |   2 +-
 .../ambari/server/state/stack/OsFamily.java     |   4 +-
 .../server/state/stack/RepositoryXml.java       |   2 +-
 .../server/state/stack/ServiceMetainfoXml.java  |   2 +-
 .../server/state/stack/StackMetainfoXml.java    |   2 +-
 .../state/stack/StackRoleCommandOrder.java      |   2 +-
 .../server/state/stack/TrimmingAdapter.java     |   4 +-
 .../ambari/server/state/stack/UpgradePack.java  |   2 +-
 .../ambari/server/state/stack/WidgetLayout.java |   2 +-
 .../server/state/stack/WidgetLayoutInfo.java    |   2 +-
 .../ambari/server/state/stack/package-info.java |   4 +-
 .../server/state/stack/upgrade/Batch.java       |   2 +-
 .../state/stack/upgrade/ClusterGrouping.java    |   2 +-
 .../state/stack/upgrade/ColocatedGrouping.java  |   2 +-
 .../server/state/stack/upgrade/Condition.java   |   2 +-
 .../upgrade/ConfigUpgradeChangeDefinition.java  |   4 +-
 .../stack/upgrade/ConfigurationCondition.java   |   2 +-
 .../state/stack/upgrade/ConfigureFunction.java  |   2 +-
 .../state/stack/upgrade/ConfigureTask.java      |   4 +-
 .../server/state/stack/upgrade/Direction.java   |   2 +-
 .../state/stack/upgrade/ExecuteHostType.java    |   2 +-
 .../server/state/stack/upgrade/ExecuteTask.java |   4 +-
 .../server/state/stack/upgrade/Grouping.java    |   2 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |   2 +-
 .../state/stack/upgrade/HostOrderItem.java      |   4 +-
 .../server/state/stack/upgrade/ManualTask.java  |   2 +-
 .../state/stack/upgrade/ParallelScheduler.java  |   2 +-
 .../state/stack/upgrade/PropertyKeyState.java   |   2 +-
 .../stack/upgrade/RepositoryVersionHelper.java  |   2 +-
 .../state/stack/upgrade/RestartGrouping.java    |   2 +-
 .../server/state/stack/upgrade/RestartTask.java |   4 +-
 .../state/stack/upgrade/SecurityCondition.java  |   2 +-
 .../state/stack/upgrade/ServerActionTask.java   |   2 +-
 .../stack/upgrade/ServerSideActionTask.java     |   2 +-
 .../stack/upgrade/ServiceCheckGrouping.java     |   2 +-
 .../state/stack/upgrade/ServiceCheckTask.java   |   4 +-
 .../state/stack/upgrade/StageWrapper.java       |   2 +-
 .../stack/upgrade/StageWrapperBuilder.java      |   2 +-
 .../state/stack/upgrade/StartGrouping.java      |   2 +-
 .../server/state/stack/upgrade/StartTask.java   |   4 +-
 .../state/stack/upgrade/StopGrouping.java       |   2 +-
 .../server/state/stack/upgrade/StopTask.java    |   4 +-
 .../ambari/server/state/stack/upgrade/Task.java |   2 +-
 .../server/state/stack/upgrade/TaskWrapper.java |   2 +-
 .../state/stack/upgrade/TaskWrapperBuilder.java |   2 +-
 .../stack/upgrade/TransferCoercionType.java     |   2 +-
 .../state/stack/upgrade/TransferOperation.java  |   2 +-
 .../stack/upgrade/UpdateStackGrouping.java      |   2 +-
 .../state/stack/upgrade/UpgradeFunction.java    |   2 +-
 .../state/stack/upgrade/UpgradeScope.java       |   2 +-
 .../server/state/stack/upgrade/UpgradeType.java |   2 +-
 .../svccomphost/ServiceComponentHostImpl.java   |   2 +-
 .../ServiceComponentHostInstallEvent.java       |   2 +-
 .../ServiceComponentHostOpFailedEvent.java      |   2 +-
 .../ServiceComponentHostOpInProgressEvent.java  |   2 +-
 .../ServiceComponentHostOpRestartedEvent.java   |   2 +-
 .../ServiceComponentHostOpSucceededEvent.java   |   2 +-
 .../ServiceComponentHostStartEvent.java         |   2 +-
 .../ServiceComponentHostStartedEvent.java       |   2 +-
 .../ServiceComponentHostStopEvent.java          |   2 +-
 .../ServiceComponentHostStoppedEvent.java       |   2 +-
 .../ServiceComponentHostSummary.java            |   2 +-
 .../ServiceComponentHostUninstallEvent.java     |   2 +-
 .../ServiceComponentHostUpgradeEvent.java       |   2 +-
 .../ServiceComponentHostWipeoutEvent.java       |   2 +-
 .../server/state/theme/ConfigCondition.java     |   2 +-
 .../ambari/server/topology/AmbariContext.java   |   2 +-
 .../ambari/server/topology/Blueprint.java       |   2 +-
 .../server/topology/BlueprintFactory.java       |   2 +-
 .../ambari/server/topology/BlueprintImpl.java   |   6 +-
 .../server/topology/BlueprintValidator.java     |   2 +-
 .../server/topology/BlueprintValidatorImpl.java |   2 +-
 .../ambari/server/topology/Cardinality.java     |   2 +-
 .../topology/ClusterConfigurationRequest.java   |   6 +-
 .../ambari/server/topology/ClusterTopology.java |   2 +-
 .../server/topology/ClusterTopologyImpl.java    |   2 +-
 .../ambari/server/topology/Component.java       |   2 +-
 .../ambari/server/topology/Configuration.java   |   2 +-
 .../server/topology/ConfigurationFactory.java   |   2 +-
 .../ambari/server/topology/Credential.java      |   2 +-
 .../ambari/server/topology/HostGroup.java       |   2 +-
 .../ambari/server/topology/HostGroupImpl.java   |   2 +-
 .../ambari/server/topology/HostGroupInfo.java   |   2 +-
 .../topology/InvalidTopologyException.java      |   2 +-
 .../InvalidTopologyTemplateException.java       |   2 +-
 .../topology/KerberosDescriptorFactory.java     |   5 +-
 .../server/topology/LogicalRequestFactory.java  |   2 +-
 .../topology/NoSuchBlueprintException.java      |   2 +-
 .../topology/NoSuchHostGroupException.java      |   2 +-
 .../ambari/server/topology/PersistedState.java  |   2 +-
 .../server/topology/PersistedStateImpl.java     |   2 +-
 .../topology/PersistedTopologyRequest.java      |   2 +-
 .../server/topology/SecurityConfiguration.java  |   2 +-
 .../topology/SecurityConfigurationFactory.java  |   2 +-
 .../apache/ambari/server/topology/Setting.java  |   2 +-
 .../ambari/server/topology/SettingFactory.java  |   2 +-
 .../ambari/server/topology/TopologyManager.java |   5 +-
 .../ambari/server/topology/TopologyRequest.java |   2 +-
 .../server/topology/TopologyRequestFactory.java |   2 +-
 .../topology/TopologyRequestFactoryImpl.java    |   2 +-
 .../server/topology/TopologyValidator.java      |   2 +-
 .../tasks/ConfigureClusterTaskFactory.java      |   2 +-
 .../server/topology/tasks/TopologyTask.java     |   2 +-
 .../RequiredConfigPropertiesValidator.java      |  10 +-
 .../server/upgrade/FinalUpgradeCatalog.java     |   2 +-
 .../server/upgrade/UpgradeCatalog210.java       |   4 +-
 .../server/upgrade/UpgradeCatalog250.java       |   2 +-
 .../server/upgrade/UpgradeCatalog252.java       |   2 +-
 .../apache/ambari/server/utils/DateUtils.java   |   2 +-
 .../server/utils/EventBusSynchronizer.java      |   2 +-
 .../apache/ambari/server/utils/HTTPUtils.java   |   5 +-
 .../apache/ambari/server/utils/HostAndPort.java |   4 +-
 .../ambari/server/utils/JaxbMapKeyList.java     |   2 +-
 .../server/utils/JaxbMapKeyListAdapter.java     |   2 +-
 .../ambari/server/utils/JaxbMapKeyMap.java      |   2 +-
 .../server/utils/JaxbMapKeyMapAdapter.java      |   2 +-
 .../ambari/server/utils/JaxbMapKeyVal.java      |   2 +-
 .../server/utils/JaxbMapKeyValAdapter.java      |   2 +-
 .../apache/ambari/server/utils/LoopBody.java    |   4 +-
 .../apache/ambari/server/utils/Parallel.java    |   2 +-
 .../ambari/server/utils/ParallelLoopResult.java |   2 +-
 .../ambari/server/utils/RequestUtils.java       |   2 +-
 .../ambari/server/utils/SecretReference.java    |   2 +-
 .../apache/ambari/server/utils/SetUtils.java    |   2 +-
 .../ambari/server/utils/ShellCommandUtil.java   |  25 +--
 .../apache/ambari/server/utils/StageUtils.java  |   2 +-
 .../ambari/server/utils/VersionUtils.java       |   2 +-
 .../apache/ambari/server/view/ClusterImpl.java  |   2 +-
 .../ambari/server/view/DefaultMasker.java       |   2 +-
 .../ambari/server/view/DirectoryWatcher.java    |   2 +-
 .../server/view/HttpImpersonatorImpl.java       |   2 +-
 .../server/view/IllegalClusterException.java    |   2 +-
 .../server/view/ImpersonatorSettingImpl.java    |   2 +-
 .../ambari/server/view/RemoteAmbariCluster.java |   2 +-
 .../view/RemoteAmbariClusterRegistry.java       |   2 +-
 .../RemoteAmbariConfigurationReadException.java |   2 +-
 .../server/view/RemoteAmbariStreamProvider.java |   2 +-
 .../server/view/ViewAmbariStreamProvider.java   |   2 +-
 .../ambari/server/view/ViewArchiveUtility.java  |   2 +-
 .../ambari/server/view/ViewClassLoader.java     |   2 +-
 .../ambari/server/view/ViewContextImpl.java     |   2 +-
 .../view/ViewDataMigrationContextImpl.java      |   2 +-
 .../server/view/ViewDataMigrationUtility.java   |   2 +-
 .../server/view/ViewDirectoryWatcher.java       |   2 +-
 .../view/ViewExternalSubResourceProvider.java   |   2 +-
 .../ambari/server/view/ViewExtractor.java       |   2 +-
 .../server/view/ViewInstanceHandlerList.java    |   2 +-
 .../ambari/server/view/ViewProviderModule.java  |   2 +-
 .../server/view/ViewSubResourceDefinition.java  |   2 +-
 .../server/view/ViewSubResourceProvider.java    |   2 +-
 .../ambari/server/view/ViewThrottleFilter.java  |   2 +-
 .../server/view/ViewURLStreamProvider.java      |   2 +-
 .../server/view/configuration/EntityConfig.java |   2 +-
 .../view/configuration/InstanceConfig.java      |   2 +-
 .../view/configuration/ParameterConfig.java     |   2 +-
 .../view/configuration/PermissionConfig.java    |   2 +-
 .../view/configuration/PersistenceConfig.java   |   2 +-
 .../view/configuration/PropertyConfig.java      |   2 +-
 .../view/configuration/ResourceConfig.java      |   2 +-
 .../server/view/configuration/ViewConfig.java   |   2 +-
 .../ambari/server/view/events/EventImpl.java    |   2 +-
 .../server/view/persistence/DataStoreImpl.java  |   2 +-
 .../view/persistence/DataStoreModule.java       |   4 +-
 .../view/persistence/SchemaManagerFactory.java  |   2 +-
 .../InstanceValidationResultImpl.java           |   2 +-
 .../view/validation/ValidationException.java    |   2 +-
 .../view/validation/ValidationResultImpl.java   |   2 +-
 .../ambari_server/dbConfiguration_linux.py      |  27 ++-
 .../HDFS/3.0.0.3.0/package/scripts/utils.py     |   2 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |   1 -
 .../YARN/3.0.0.3.0/package/scripts/yarn.py      |   1 -
 .../ZEPPELIN/0.6.0.3.0/service_advisor.py       | 167 +++++++++++++++++++
 .../3.0/hooks/after-INSTALL/scripts/params.py   |  14 ++
 .../scripts/shared_initialization.py            |  17 ++
 .../apache/ambari/server/H2DatabaseCleaner.java |   2 +-
 .../ambari/server/RandomPortJerseyTest.java     |   2 +-
 .../ambari/server/StateRecoveryManagerTest.java |   2 +-
 .../actionmanager/ActionManagerTestHelper.java  |   2 +-
 .../actionmanager/HostRoleStatusTest.java       |   2 +-
 .../ambari/server/actionmanager/StageTest.java  |   2 +-
 .../actionmanager/TestActionDBAccessorImpl.java |   2 +-
 .../server/actionmanager/TestActionManager.java |   2 +-
 .../actionmanager/TestActionScheduler.java      |   2 +-
 .../TestActionSchedulerThreading.java           |   2 +-
 .../ambari/server/actionmanager/TestStage.java  |   2 +-
 .../ambari/server/agent/AgentHostInfoTest.java  |   2 +-
 .../ambari/server/agent/AgentResourceTest.java  |   2 +-
 .../server/agent/HeartbeatProcessorTest.java    |   2 +-
 .../server/agent/HeartbeatTestHelper.java       |   2 +-
 .../server/agent/LocalAgentSimulator.java       |   7 +-
 .../ambari/server/agent/TestActionQueue.java    |   2 +-
 .../server/agent/TestHeartbeatHandler.java      |   4 +-
 .../server/agent/TestHeartbeatMonitor.java      |   2 +-
 .../alerts/AgentHeartbeatAlertRunnableTest.java |   2 +-
 .../alerts/AmbariPerformanceRunnableTest.java   |   2 +-
 .../ComponentVersionAlertRunnableTest.java      |   2 +-
 .../server/alerts/StaleAlertRunnableTest.java   |   2 +-
 .../org/apache/ambari/server/api/TestSuite.java |  12 +-
 .../server/api/UserNameOverrideFilterTest.java  |   2 +-
 .../server/api/handlers/CreateHandlerTest.java  |   2 +-
 .../server/api/handlers/DeleteHandlerTest.java  |   5 +-
 .../api/handlers/QueryCreateHandlerTest.java    |   2 +-
 .../server/api/handlers/ReadHandlerTest.java    |   2 +-
 .../server/api/handlers/UpdateHandlerTest.java  |   4 +-
 .../server/api/predicate/QueryLexerTest.java    |   2 +-
 .../server/api/predicate/QueryParserTest.java   |   2 +-
 .../predicate/operators/AndOperatorTest.java    |   4 +-
 .../predicate/operators/EqualsOperatorTest.java |   4 +-
 .../predicate/operators/FilterOperatorTest.java |   2 +-
 .../operators/GreaterEqualsOperatorTest.java    |   4 +-
 .../operators/GreaterOperatorTest.java          |   4 +-
 .../api/predicate/operators/InOperatorTest.java |   2 +-
 .../operators/IsEmptyOperatorTest.java          |   2 +-
 .../operators/LessEqualsOperatorTest.java       |   4 +-
 .../predicate/operators/LessOperatorTest.java   |   4 +-
 .../operators/NotEqualsOperatorTest.java        |   4 +-
 .../predicate/operators/NotOperatorTest.java    |   4 +-
 .../api/predicate/operators/OrOperatorTest.java |   4 +-
 .../ExtendedResourcePredicateVisitorTest.java   |   2 +-
 .../server/api/query/JpaSortBuilderTest.java    |   2 +-
 .../query/ProcessingPredicateVisitorTest.java   |   2 +-
 .../ambari/server/api/query/QueryImplTest.java  |   2 +-
 .../ambari/server/api/query/QueryInfoTest.java  |   2 +-
 .../query/SubResourcePredicateVisitorTest.java  |   2 +-
 .../render/ClusterBlueprintRendererTest.java    |   2 +-
 .../api/query/render/DefaultRendererTest.java   |   2 +-
 .../render/MetricsPaddingRendererTest.java      |   2 +-
 .../api/query/render/MinimalRendererTest.java   |   2 +-
 .../resources/BaseResourceDefinitionTest.java   |   2 +-
 .../BlueprintResourceDefinitionTest.java        |   2 +-
 .../ClusterResourceDefinitionTest.java          |   2 +-
 ...onentStackVersionResourceDefinitionTest.java |   2 +-
 .../resources/FeedResourceDefinitionTest.java   |   2 +-
 .../resources/HostResourceDefinitionTest.java   |   2 +-
 .../InstanceResourceDefinitionTest.java         |   2 +-
 .../LdapSyncEventResourceDefinitionTest.java    |   2 +-
 .../PermissionResourceDefinitionTest.java       |   2 +-
 .../PrivilegeResourceDefinitionTest.java        |   2 +-
 .../RepositoryResourceDefinitionTest.java       |   2 +-
 ...RepositoryVersionResourceDefinitionTest.java |   2 +-
 .../ResourceInstanceFactoryImplTest.java        |   2 +-
 .../ServiceResourceDefinitionTest.java          |   2 +-
 .../resources/SimpleResourceDefinitionTest.java |   4 +-
 .../StackConfigurationDefinitionTest.java       |   2 +-
 ...ckConfigurationDependencyDefinitionTest.java |   2 +-
 .../StackServiceResourceDefinitionTest.java     |   2 +-
 .../StackVersionResourceDefinitionTest.java     |   2 +-
 .../TargetClusterResourceDefinitionTest.java    |   2 +-
 .../UpgradeResourceDefinitionTest.java          |   4 +-
 .../resources/UserResourceDefinitionTest.java   |   2 +-
 .../ViewExternalSubResourceDefinitionTest.java  |   2 +-
 .../ViewInstanceResourceDefinitionTest.java     |   2 +-
 .../ViewPermissionResourceDefinitionTest.java   |   2 +-
 .../resources/ViewResourceDefinitionTest.java   |   2 +-
 .../ViewVersionResourceDefinitionTest.java      |   2 +-
 .../server/api/services/ActionServiceTest.java  |   2 +-
 .../server/api/services/AmbariMetaInfoTest.java |   7 +-
 .../server/api/services/BaseRequestTest.java    |   2 +-
 .../server/api/services/BaseServiceTest.java    |   2 +-
 .../api/services/BlueprintServiceTest.java      |   4 +-
 .../services/ClusterPrivilegeServiceTest.java   |   4 +-
 .../ClusterStackVersionServiceTest.java         |   4 +-
 .../api/services/ComponentServiceTest.java      |   2 +-
 .../api/services/ConfigGroupServiceTest.java    |   2 +-
 .../api/services/ConfigurationServiceTest.java  |   2 +-
 .../server/api/services/DeleteRequestTest.java  |   2 +-
 .../api/services/DeleteResultMetaDataTest.java  |   2 +-
 .../api/services/ExtensionsServiceTest.java     |   2 +-
 .../server/api/services/FeedServiceTest.java    |   2 +-
 .../server/api/services/GetRequestTest.java     |   2 +-
 .../server/api/services/GroupServiceTest.java   |   4 +-
 .../api/services/HostComponentServiceTest.java  |   2 +-
 .../server/api/services/HostServiceTest.java    |   2 +-
 .../services/HostStackVersionServiceTest.java   |   4 +-
 .../api/services/InstanceServiceTest.java       |   2 +-
 .../api/services/LdapSyncEventServiceTest.java  |   2 +-
 .../server/api/services/LoggingServiceTest.java |   2 +-
 .../api/services/NamedPropertySetTest.java      |   2 +-
 .../api/services/PermissionServiceTest.java     |   2 +-
 .../server/api/services/PersistServiceTest.java |   2 +-
 .../services/PersistenceManagerImplTest.java    |   4 +-
 .../server/api/services/PostRequestTest.java    |   2 +-
 .../services/PreUpgradeCheckServiceTest.java    |   4 +-
 .../api/services/PrivilegeServiceTest.java      |   2 +-
 .../server/api/services/PutRequestTest.java     |   2 +-
 .../api/services/QueryPostRequestTest.java      |   2 +-
 .../api/services/RecommendationServiceTest.java |   2 +-
 .../api/services/RepositoryServiceTest.java     |   4 +-
 .../server/api/services/RequestBodyTest.java    |   2 +-
 .../server/api/services/RequestFactoryTest.java |   2 +-
 .../api/services/RootServiceServiceTest.java    |   2 +-
 .../server/api/services/ServiceServiceTest.java |   2 +-
 .../server/api/services/SettingServiceTest.java |   2 +-
 .../server/api/services/StacksServiceTest.java  |   2 +-
 .../api/services/TargetClusterServiceTest.java  |   2 +-
 .../services/UpdatePersistenceManagerTest.java  |   2 +-
 .../api/services/UpgradeItemServiceTest.java    |   4 +-
 .../api/services/ValidationServiceTest.java     |   2 +-
 .../services/ViewSubResourceServiceTest.java    |   2 +-
 .../parsers/BodyParseExceptionTest.java         |   2 +-
 .../parsers/JsonRequestBodyParserTest.java      |   2 +-
 .../serializers/JsonSerializerTest.java         |   2 +-
 .../stackadvisor/StackAdvisorExceptionTest.java |   2 +-
 .../stackadvisor/StackAdvisorHelperTest.java    |   2 +-
 .../StackAdvisorRequestTypeTest.java            |   2 +-
 .../stackadvisor/StackAdvisorRunnerTest.java    |   2 +-
 .../ConfigurationRecommendationCommandTest.java |   4 +-
 .../commands/StackAdvisorCommandTest.java       |   2 +-
 .../views/ViewDataMigrationServiceTest.java     |   2 +-
 .../ViewExternalSubResourceServiceTest.java     |   2 +-
 .../audit/AccessUnauthorizedAuditEventTest.java |   2 +-
 .../server/audit/LoginAuditEventTest.java       |   2 +-
 .../server/audit/LogoutAuditEventTest.java      |   2 +-
 .../audit/OperationStatusAuditEventTest.java    |   2 +-
 .../StartOperationRequestAuditEventTest.java    |   2 +-
 .../audit/request/AbstractBaseCreator.java      |   2 +-
 .../server/audit/request/AllGetCreator.java     |   2 +-
 .../audit/request/AllPostAndPutCreator.java     |   2 +-
 .../audit/request/DefaultEventCreatorTest.java  |   2 +-
 .../audit/request/PutHostComponentCreator.java  |   2 +-
 .../audit/request/RequestAuditLogModule.java    |   2 +-
 .../audit/request/RequestAuditLoggerTest.java   |   2 +-
 .../server/bootstrap/BootStrapResourceTest.java |   2 +-
 .../ambari/server/bootstrap/BootStrapTest.java  |   2 +-
 .../checks/AutoStartDisabledCheckTest.java      |   2 +-
 ...ardcodedStackVersionPropertiesCheckTest.java |   4 +-
 .../checks/HiveMultipleMetastoreCheckTest.java  |   2 +-
 .../server/checks/UpgradeCheckOrderTest.java    |   2 +-
 .../server/checks/VersionMismatchCheckTest.java |   4 +-
 .../server/cleanup/CleanupServiceImplTest.java  |   4 +-
 .../ComponentSSLConfigurationTest.java          |   2 +-
 .../configuration/RecoveryConfigHelperTest.java |   2 +-
 .../server/controller/ActionRequestTest.java    |   2 +-
 .../server/controller/ActionResponseTest.java   |   5 +-
 .../AmbariCustomCommandExecutionHelperTest.java |   8 +-
 .../controller/AmbariHandlerListTest.java       |   2 +-
 .../AmbariManagementControllerImplTest.java     |   2 +-
 .../AmbariManagementControllerTest.java         |   4 +-
 .../server/controller/AmbariServerTest.java     |   2 +-
 .../controller/AmbariSessionManagerTest.java    |   4 +-
 .../BackgroundCustomCommandExecutionTest.java   |   2 +-
 .../server/controller/ClusterRequestTest.java   |   2 +-
 .../server/controller/ClusterResponseTest.java  |   5 +-
 .../server/controller/LdapSyncRequestTest.java  |   2 +-
 .../controller/MaintenanceStateHelperTest.java  |   2 +-
 ...hYarnCapacitySchedulerReleaseConfigTest.java |   2 +-
 .../RootServiceResponseFactoryTest.java         |   2 +-
 .../ServiceConfigVersionResponseTest.java       |   2 +-
 .../controller/StackServiceResponseTest.java    |   2 +-
 .../AbstractControllerResourceProviderTest.java |   2 +-
 .../AbstractDRResourceProviderTest.java         |   2 +-
 .../internal/AbstractPropertyProviderTest.java  |   2 +-
 .../internal/AbstractResourceProviderTest.java  |   2 +-
 .../internal/ActionResourceProviderTest.java    |   2 +-
 .../AlertDefinitionResourceProviderTest.java    |   2 +-
 .../AlertGroupResourceProviderTest.java         |   2 +-
 .../AlertHistoryResourceProviderTest.java       |   2 +-
 .../AlertNoticeResourceProviderTest.java        |   2 +-
 .../internal/AlertResourceProviderTest.java     |   2 +-
 .../AlertTargetResourceProviderTest.java        |   2 +-
 .../internal/AppCookieManagerTest.java          |   2 +-
 .../internal/ArtifactResourceProviderTest.java  |   2 +-
 .../AtlasServerHttpPropertyRequestTest.java     |   4 +-
 .../controller/internal/BaseProviderTest.java   |   2 +-
 .../internal/BlueprintResourceProviderTest.java |   2 +-
 .../internal/CalculatedStatusTest.java          |   2 +-
 .../ClientConfigResourceProviderTest.java       |   2 +-
 .../internal/ClusterControllerImplTest.java     |   2 +-
 .../internal/ClusterResourceProviderTest.java   |   2 +-
 ...ClusterStackVersionResourceProviderTest.java |   2 +-
 ...leRepositoryVersionResourceProviderTest.java |   2 +-
 .../internal/ComponentResourceProviderTest.java |   2 +-
 .../ConfigurationResourceProviderTest.java      |   2 +-
 .../internal/DeleteStatusMetaDataTest.java      |   4 +-
 .../internal/ExportBlueprintRequestTest.java    |   2 +-
 .../internal/ExtensionResourceProviderTest.java |   2 +-
 .../internal/FeedResourceProviderTest.java      |   2 +-
 ...ostComponentProcessResourceProviderTest.java |   2 +-
 .../HostComponentResourceProviderTest.java      |   2 +-
 .../HostStackVersionResourceProviderTest.java   |   2 +-
 .../internal/HttpPropertyProviderTest.java      |   2 +-
 .../internal/InstanceResourceProviderTest.java  |   2 +-
 .../internal/JMXHostProviderTest.java           |   2 +-
 .../LdapSyncEventResourceProviderTest.java      |   2 +-
 .../internal/MetricsServiceProviderTest.java    |   2 +-
 .../internal/PageRequestImplTest.java           |   2 +-
 .../internal/PageResponseImplTest.java          |   2 +-
 .../PermissionResourceProviderTest.java         |   2 +-
 .../PreUpgradeCheckResourceProviderTest.java    |   2 +-
 .../internal/PropertyPredicateVisitorTest.java  |   2 +-
 .../internal/ProvisionClusterRequestTest.java   |   2 +-
 .../QuickLinkArtifactResourceProviderTest.java  |   2 +-
 .../RecommendationResourceProviderTest.java     |   4 +-
 .../RemoteClusterResourceProviderTest.java      |   2 +-
 .../RepositoryResourceProviderTest.java         |   2 +-
 .../RepositoryVersionResourceProviderTest.java  |   2 +-
 .../controller/internal/RequestImplTest.java    |   2 +-
 .../internal/RequestOperationLevelTest.java     |   2 +-
 .../RequestScheduleResourceProviderTest.java    |   2 +-
 .../internal/RequestStageContainerTest.java     |   2 +-
 .../internal/RequestStatusImplTest.java         |   2 +-
 .../controller/internal/ResourceImplTest.java   |   2 +-
 ...erviceHostComponentResourceProviderTest.java |   2 +-
 .../RootServiceResourceProviderTest.java        |   2 +-
 .../internal/ScaleClusterRequestTest.java       |   2 +-
 .../controller/internal/SchemaImplTest.java     |   2 +-
 .../internal/ServiceResourceProviderTest.java   |   2 +-
 .../internal/SettingResourceProviderTest.java   |   2 +-
 .../SimplifyingPredicateVisitorTest.java        |   2 +-
 .../StackAdvisorResourceProviderTest.java       |   2 +-
 .../StackArtifactResourceProviderTest.java      |   2 +-
 ...igurationDependencyResourceProviderTest.java |   2 +-
 .../StackConfigurationResourceProviderTest.java |   2 +-
 .../StackDefinedPropertyProviderTest.java       |   2 +-
 .../StackDependencyResourceProviderTest.java    |   2 +-
 ...kLevelConfigurationResourceProviderTest.java |   2 +-
 .../internal/StackResourceProviderTest.java     |   2 +-
 .../StackServiceResourceProviderTest.java       |   2 +-
 .../server/controller/internal/StackTest.java   |   2 +-
 .../StackUpgradeConfigurationMergeTest.java     |   2 +-
 .../internal/StageResourceProviderTest.java     |   4 +-
 .../TargetClusterResourceProviderTest.java      |   2 +-
 .../internal/TaskResourceProviderTest.java      |   2 +-
 .../internal/TestIvoryProviderModule.java       |   2 +-
 .../controller/internal/TestIvoryService.java   |   2 +-
 .../internal/URLStreamProviderTest.java         |   4 +-
 .../internal/UpgradeResourceProviderTest.java   |   2 +-
 .../UpgradeSummaryResourceProviderTest.java     |   2 +-
 .../internal/UserResourceProviderDBTest.java    |   2 +-
 .../ValidationResourceProviderTest.java         |   4 +-
 .../VersionDefinitionResourceProviderTest.java  |   2 +-
 .../ViewInstanceResourceProviderTest.java       |   2 +-
 .../ViewPermissionResourceProviderTest.java     |   2 +-
 .../internal/ViewURLResourceProviderTest.java   |   4 +-
 .../WidgetLayoutResourceProviderTest.java       |   2 +-
 .../internal/WidgetResourceProviderTest.java    |   2 +-
 .../server/controller/ivory/ClusterTest.java    |   2 +-
 .../server/controller/ivory/FeedTest.java       |   2 +-
 .../server/controller/ivory/InstanceTest.java   |   2 +-
 .../jdbc/TestJDBCResourceProvider.java          |   2 +-
 .../controller/jmx/TestStreamProvider.java      |   2 +-
 .../logging/LogLevelQueryResponseTest.java      |   2 +-
 .../controller/logging/LogLineResultTest.java   |   2 +-
 .../logging/LogQueryResponseTest.java           |   2 +-
 .../LogSearchDataRetrievalServiceTest.java      |   2 +-
 .../LoggingRequestHelperFactoryImplTest.java    |   2 +-
 .../logging/LoggingRequestHelperImplTest.java   |   2 +-
 .../server/controller/logging/UtilsTest.java    |   2 +-
 .../metrics/JMXPropertyProviderTest.java        |   2 +-
 .../RestMetricsPropertyProviderTest.java        |   2 +-
 .../ThreadPoolEnabledPropertyProviderTest.java  |   2 +-
 .../metrics/ganglia/GangliaMetricTest.java      |   4 +-
 .../ganglia/GangliaPropertyProviderTest.java    |   2 +-
 .../GangliaReportPropertyProviderTest.java      |   2 +-
 .../metrics/ganglia/TestHttpUrlConnection.java  |   5 +-
 .../metrics/ganglia/TestStreamProvider.java     |   5 +-
 .../timeline/AMSPropertyProviderTest.java       |   2 +-
 .../timeline/AMSReportPropertyProviderTest.java |   2 +-
 .../timeline/MetricsPaddingMethodTest.java      |   2 +-
 .../timeline/MetricsRequestHelperTest.java      |   2 +-
 .../cache/TimelineMetricCacheSizingTest.java    |   2 +-
 .../timeline/cache/TimelineMetricCacheTest.java |   2 +-
 .../controller/predicate/AndPredicateTest.java  |   2 +-
 .../predicate/CategoryIsEmptyPredicateTest.java |   2 +-
 .../predicate/CategoryPredicateTest.java        |   2 +-
 .../predicate/EqualsPredicateTest.java          |   2 +-
 .../predicate/FilterPredicateTest.java          |   2 +-
 .../predicate/GreaterEqualsPredicateTest.java   |   2 +-
 .../predicate/GreaterPredicateTest.java         |   2 +-
 .../predicate/LessEqualsPredicateTest.java      |   2 +-
 .../controller/predicate/LessPredicateTest.java |   2 +-
 .../controller/predicate/NotPredicateTest.java  |   2 +-
 .../controller/predicate/OrPredicateTest.java   |   2 +-
 .../predicate/PredicateVisitorTest.java         |   2 +-
 .../server/controller/spi/ResourceTest.java     |   2 +-
 ...ThreadPoolExecutorCompletionServiceTest.java |   2 +-
 .../utilities/DatabaseCheckerTest.java          |   2 +-
 .../utilities/PredicateBuilderTest.java         |   2 +-
 .../utilities/PropertyHelperTest.java           |   8 +-
 .../DefaultServiceCalculatedStateTest.java      |   2 +-
 .../state/FlumeServiceCalculatedStateTest.java  |   2 +-
 .../GeneralServiceCalculatedStateTest.java      |   2 +-
 .../state/HBaseServiceCalculatedStateTest.java  |   2 +-
 .../state/HDFSServiceCalculatedStateTest.java   |   2 +-
 .../state/HiveServiceCalculatedStateTest.java   |   2 +-
 .../state/OozieServiceCalculatedStateTest.java  |   2 +-
 .../state/YarnServiceCalculatedStateTest.java   |   2 +-
 .../utilities/webserver/StartServer.java        |   2 +-
 .../credentialapi/CredentialUtilTest.java       |   4 +-
 .../ActionDefinitionManagerTest.java            |   2 +-
 .../apache/ambari/server/events/EventsTest.java |   2 +-
 .../ambari/server/events/MockEventListener.java |   2 +-
 .../listeners/tasks/TaskStatusListenerTest.java |   2 +-
 .../AlertMaintenanceModeListenerTest.java       |   6 +-
 .../HostVersionOutOfSyncListenerTest.java       |   2 +-
 .../upgrade/StackUpgradeFinishListenerTest.java |   4 +-
 .../upgrade/StackVersionListenerTest.java       |   4 +-
 .../publishers/VersionEventPublisherTest.java   |   4 +-
 .../server/hooks/users/UserHookServiceTest.java |   4 +-
 .../metadata/AgentAlertDefinitionsTest.java     |   2 +-
 .../server/metadata/RoleCommandOrderTest.java   |   2 +-
 .../ambari/server/metadata/RoleGraphTest.java   |   2 +-
 .../metric/system/impl/MetricsServiceTest.java  |   4 +-
 .../metric/system/impl/MetricsSourceTest.java   |   4 +-
 .../system/impl/TestAmbariMetricsSinkImpl.java  |   2 +-
 .../metric/system/impl/TestMetricsSource.java   |   4 +-
 .../notifications/DispatchFactoryTest.java      |   2 +-
 .../server/notifications/MockDispatcher.java    |   2 +-
 .../dispatchers/AlertScriptDispatcherTest.java  |   2 +-
 .../dispatchers/AmbariSNMPDispatcherTest.java   |   2 +-
 .../dispatchers/EmailDispatcherTest.java        |   2 +-
 .../dispatchers/SNMPDispatcherTest.java         |   2 +-
 .../ambari/server/orm/AlertDaoHelper.java       |   2 +-
 .../server/orm/InMemoryDefaultTestModule.java   |   5 +-
 .../ambari/server/orm/JdbcPropertyTest.java     |   2 +-
 .../apache/ambari/server/orm/OrmTestHelper.java |   2 +-
 .../apache/ambari/server/orm/TestOrmImpl.java   |   2 +-
 .../server/orm/dao/AlertDefinitionDAOTest.java  |   2 +-
 .../server/orm/dao/AlertDispatchDAOTest.java    |   2 +-
 .../server/orm/dao/AlertsDAOCachedTest.java     |   2 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java    |   2 +-
 .../ambari/server/orm/dao/BlueprintDAOTest.java |   2 +-
 .../server/orm/dao/ConfigGroupDAOTest.java      |   2 +-
 .../ambari/server/orm/dao/CrudDAOTest.java      |   2 +-
 .../ambari/server/orm/dao/GroupDAOTest.java     |   2 +-
 .../dao/HostComponentDesiredStateDAOTest.java   |   4 +-
 .../orm/dao/HostComponentStateDAOTest.java      |   4 +-
 .../orm/dao/HostConfigMappingDAOTest.java       |   2 +-
 .../server/orm/dao/HostRoleCommandDAOTest.java  |   2 +-
 .../server/orm/dao/HostVersionDAOTest.java      |   2 +-
 .../ambari/server/orm/dao/PrincipalDAOTest.java |   2 +-
 .../server/orm/dao/PrincipalTypeDAOTest.java    |   2 +-
 .../orm/dao/RepositoryVersionDAOTest.java       |   2 +-
 .../ambari/server/orm/dao/RequestDAOTest.java   |   2 +-
 .../server/orm/dao/RequestScheduleDAOTest.java  |   2 +-
 .../ambari/server/orm/dao/ResourceDAOTest.java  |   2 +-
 .../server/orm/dao/ResourceTypeDAOTest.java     |   2 +-
 .../server/orm/dao/ServiceConfigDAOTest.java    |   2 +-
 .../ambari/server/orm/dao/SettingDAOTest.java   |   2 +-
 .../ambari/server/orm/dao/StageDAOTest.java     |   2 +-
 .../orm/dao/TopologyLogicalRequestDAOTest.java  |   2 +-
 .../server/orm/dao/TopologyRequestDAOTest.java  |   2 +-
 .../ambari/server/orm/dao/UpgradeDAOTest.java   |   2 +-
 .../ambari/server/orm/dao/UserDAOTest.java      |   2 +-
 .../server/orm/dao/ViewInstanceDAOTest.java     |   2 +-
 .../ambari/server/orm/dao/WidgetDAOTest.java    |   2 +-
 .../server/orm/dao/WidgetLayoutDAOTest.java     |   2 +-
 .../apache/ambari/server/orm/db/DDLTests.java   |   2 +-
 .../orm/entities/AlertCurrentEntityTest.java    |   2 +-
 .../orm/entities/AlertDefinitionEntityTest.java |   2 +-
 .../orm/entities/AlertHistoryEntityTest.java    |   2 +-
 .../entities/BlueprintConfigEntityPKTest.java   |   2 +-
 .../orm/entities/BlueprintConfigEntityTest.java |   2 +-
 .../orm/entities/BlueprintEntityTest.java       |   2 +-
 .../entities/BlueprintSettingEntityTest.java    |   2 +-
 .../server/orm/entities/HostEntityTest.java     |   4 +-
 .../entities/HostGroupComponentEntityTest.java  |   2 +-
 .../entities/HostGroupConfigEntityPKTest.java   |   2 +-
 .../orm/entities/HostGroupConfigEntityTest.java |   2 +-
 .../orm/entities/HostGroupEntityTest.java       |   2 +-
 .../orm/entities/HostRoleCommandEntityTest.java |   2 +-
 .../orm/entities/LdapSyncEventEntityTest.java   |   2 +-
 .../orm/entities/LdapSyncSpecEntityTest.java    |   2 +-
 .../orm/entities/PrincipalEntityTest.java       |   2 +-
 .../orm/entities/PrincipalTypeEntityTest.java   |   2 +-
 .../server/orm/entities/ResourceEntityTest.java |   2 +-
 .../orm/entities/ResourceTypeEntityTest.java    |   2 +-
 .../orm/entities/ServiceConfigEntityTest.java   |   2 +-
 .../server/orm/entities/SettingEntityTest.java  |   2 +-
 .../server/orm/entities/StageEntityTest.java    |   2 +-
 .../orm/entities/ViewEntityEntityTest.java      |   2 +-
 .../server/orm/entities/ViewEntityTest.java     |   2 +-
 .../orm/entities/ViewInstanceEntityTest.java    |   2 +-
 .../ambari/server/proxy/ProxyServiceTest.java   |   2 +-
 .../ambari/server/resources/TestResources.java  |   2 +-
 .../scheduler/ExecutionScheduleManagerTest.java |   2 +-
 .../scheduler/ExecutionSchedulerTest.java       |   2 +-
 .../server/security/CertGenerationTest.java     |   2 +-
 .../server/security/SecurityFilterTest.java     |   2 +-
 .../server/security/SecurityHelperImplTest.java |   2 +-
 .../server/security/SslExecutionTest.java       |   2 +-
 .../authorization/AmbariAuthenticationTest.java |   2 +-
 ...mbariLdapAuthenticationProviderBaseTest.java |   2 +-
 ...uthenticationProviderForDNWithSpaceTest.java |   2 +-
 ...henticationProviderForDuplicateUserTest.java |   2 +-
 .../AmbariLdapAuthenticationProviderTest.java   |   2 +-
 .../AmbariLocalUserProviderTest.java            |   2 +-
 .../AmbariPamAuthenticationProviderTest.java    |   2 +-
 .../AmbariUserAuthenticationFilterTest.java     |   4 +-
 .../AuthorizationHelperInitializer.java         |   2 +-
 .../authorization/AuthorizationHelperTest.java  |   2 +-
 .../authorization/AuthorizationTestModule.java  |   2 +-
 ...thorizationTestModuleForLdapDNWithSpace.java |   2 +-
 .../authorization/LdapServerPropertiesTest.java |   2 +-
 .../TestAmbariLdapAuthoritiesPopulator.java     |   2 +-
 .../security/encryption/AESEncryptorTest.java   |   2 +-
 .../encryption/CredentialProviderTest.java      |   2 +-
 .../encryption/CredentialStoreTest.java         |   2 +-
 .../encryption/MasterKeyServiceTest.java        |   2 +-
 .../ldap/AmbariLdapDataPopulatorTest.java       |   2 +-
 .../serveraction/kerberos/KDCTypeTest.java      |   4 +-
 .../AutoSkipFailedSummaryActionTest.java        |   2 +-
 .../ComponentVersionCheckActionTest.java        |   2 +-
 .../upgrades/ConfigureActionTest.java           |   2 +-
 .../FixCapacitySchedulerOrderingPolicyTest.java |   2 +-
 .../upgrades/FixLzoCodecPathTest.java           |   2 +-
 .../upgrades/FixOozieAdminUsersTest.java        |   2 +-
 .../upgrades/FixYarnWebServiceUrlTest.java      |   2 +-
 .../HBaseEnvMaxDirectMemorySizeActionTest.java  |   2 +-
 .../upgrades/HiveEnvClasspathActionTest.java    |   2 +-
 .../upgrades/HiveZKQuorumConfigActionTest.java  |   2 +-
 .../upgrades/KerberosKeytabsActionTest.java     |   2 +-
 .../upgrades/OozieConfigCalculationTest.java    |   2 +-
 .../upgrades/RangerConfigCalculationTest.java   |   2 +-
 .../RangerKerberosConfigCalculationTest.java    |   2 +-
 .../upgrades/RangerKmsProxyConfigTest.java      |   4 +-
 .../RangerWebAlertConfigActionTest.java         |   4 +-
 .../upgrades/UpgradeActionTest.java             |   2 +-
 .../UpgradeUserKerberosDescriptorTest.java      |   2 +-
 .../CsvFilePersisterServiceFunctionalTest.java  |   4 +-
 .../PostUserCreationHookServerActionTest.java   |   4 +-
 .../server/stack/ComponentModuleTest.java       |   2 +-
 .../QuickLinksConfigurationModuleTest.java      |   2 +-
 .../ambari/server/stack/RepoUtilTest.java       |   2 +-
 .../ambari/server/stack/ServiceModuleTest.java  |   2 +-
 .../stack/StackManagerCommonServicesTest.java   |   2 +-
 .../server/stack/StackManagerExtensionTest.java |   2 +-
 .../server/stack/StackManagerMiscTest.java      |   2 +-
 .../ambari/server/stack/StackManagerMock.java   |   2 +-
 .../ambari/server/stack/StackManagerTest.java   |   2 +-
 .../ambari/server/stack/StackModuleTest.java    |   2 +-
 .../ambari/server/stack/ThemeModuleTest.java    |   4 +-
 .../UpdateActiveRepoVersionOnStartupTest.java   |   2 +-
 .../server/stageplanner/TestStagePlanner.java   |   2 +-
 .../apache/ambari/server/state/AlertTest.java   |   2 +-
 .../ambari/server/state/CheckHelperTest.java    |   5 +-
 .../ambari/server/state/ConfigGroupTest.java    |   2 +-
 .../ambari/server/state/ConfigHelperTest.java   |   2 +-
 .../server/state/ConfigMergeHelperTest.java     |   2 +-
 .../ambari/server/state/DesiredConfigTest.java  |   2 +-
 .../ambari/server/state/PropertyInfoTest.java   |   4 +-
 .../server/state/RequestExecutionTest.java      |   2 +-
 .../server/state/ServiceComponentTest.java      |   2 +-
 .../ambari/server/state/ServiceInfoTest.java    |   2 +-
 .../server/state/ServicePropertiesTest.java     |   4 +-
 .../server/state/ServicePropertyInfoTest.java   |   2 +-
 .../apache/ambari/server/state/ServiceTest.java |   2 +-
 .../ambari/server/state/UpgradeHelperTest.java  |   2 +-
 .../ambari/server/state/action/JobTest.java     |   2 +-
 .../alerts/AggregateAlertListenerTest.java      |   2 +-
 .../alerts/AlertDefinitionEqualityTest.java     |   2 +-
 .../state/alerts/AlertDefinitionHashTest.java   |   2 +-
 .../state/alerts/AlertEventPublisherTest.java   |   2 +-
 .../state/alerts/AlertReceivedListenerTest.java |   2 +-
 .../alerts/AlertStateChangedEventTest.java      |   2 +-
 .../state/alerts/InitialAlertEventTest.java     |   2 +-
 .../state/cluster/AlertDataManagerTest.java     |   2 +-
 .../state/cluster/ClusterDeadlockTest.java      |   2 +-
 .../server/state/cluster/ClusterImplTest.java   |   2 +-
 .../server/state/cluster/ClusterTest.java       |   7 +-
 .../state/cluster/ClustersDeadlockTest.java     |   2 +-
 .../server/state/cluster/ClustersImplTest.java  |   4 +-
 .../server/state/cluster/ClustersTest.java      |   2 +-
 .../ConcurrentServiceConfigVersionTest.java     |   2 +-
 ...omponentHostConcurrentWriteDeadlockTest.java |   2 +-
 .../ambari/server/state/host/HostImplTest.java  |   4 +-
 .../ambari/server/state/host/HostTest.java      |   2 +-
 .../state/repository/VersionDefinitionTest.java |   2 +-
 .../AlertNoticeDispatchServiceTest.java         |   2 +-
 .../services/CachedAlertFlushServiceTest.java   |   2 +-
 .../services/MetricsRetrievalServiceTest.java   |   2 +-
 .../services/RetryUpgradeActionServiceTest.java |   2 +-
 .../state/stack/ConfigUpgradePackTest.java      |   2 +-
 .../state/stack/ConfigUpgradeValidityTest.java  |   2 +-
 .../ambari/server/state/stack/OSFamilyTest.java |   2 +-
 .../state/stack/UpgradePackParsingTest.java     |   2 +-
 .../server/state/stack/UpgradePackTest.java     |   2 +-
 .../upgrade/RepositoryVersionHelperTest.java    |   2 +-
 .../stack/upgrade/StageWrapperBuilderTest.java  |   2 +-
 .../svccomphost/ServiceComponentHostTest.java   |   2 +-
 .../server/testing/DBInconsistencyTests.java    |   2 +-
 .../server/testing/DeadlockWarningThread.java   |   2 +-
 .../server/testing/DeadlockedThreadsTest.java   |   4 +-
 .../server/topology/AmbariContextTest.java      |   2 +-
 .../server/topology/BlueprintFactoryTest.java   |   2 +-
 .../server/topology/BlueprintImplTest.java      |   2 +-
 .../topology/BlueprintValidatorImplTest.java    |   2 +-
 .../ClusterConfigurationRequestTest.java        |   2 +-
 .../ClusterDeployWithStartOnlyTest.java         |   2 +-
 ...InstallWithoutStartOnComponentLevelTest.java |   2 +-
 .../ClusterInstallWithoutStartTest.java         |   2 +-
 .../topology/ClusterTopologyImplTest.java       |   4 +-
 .../topology/ConfigurationFactoryTest.java      |   2 +-
 .../server/topology/ConfigurationTest.java      |   2 +-
 .../topology/ConfigureClusterTaskTest.java      |   4 +-
 .../server/topology/HostGroupInfoTest.java      |   2 +-
 .../server/topology/LogicalRequestTest.java     |   2 +-
 .../topology/RequiredPasswordValidatorTest.java |   2 +-
 .../SecurityConfigurationFactoryTest.java       |   2 +-
 .../server/topology/SettingFactoryTest.java     |   2 +-
 .../ambari/server/topology/SettingTest.java     |   2 +-
 .../server/topology/TopologyManagerTest.java    |   2 +-
 .../RequiredConfigPropertiesValidatorTest.java  |  35 ++--
 .../server/upgrade/UpgradeCatalog211Test.java   |   2 +-
 .../server/upgrade/UpgradeCatalogHelper.java    |   2 +-
 .../utils/CollectionPresentationUtils.java      |   2 +-
 .../ambari/server/utils/RequestUtilsTest.java   |   2 +-
 .../ambari/server/utils/SetUtilsTest.java       |   2 +-
 .../ambari/server/utils/StageUtilsTest.java     |   2 +-
 .../utils/SynchronousThreadPoolExecutor.java    |   2 +-
 .../ambari/server/utils/TestDateUtils.java      |   2 +-
 .../ambari/server/utils/TestHTTPUtils.java      |   2 +-
 .../ambari/server/utils/TestJsonUtils.java      |   2 +-
 .../ambari/server/utils/TestParallel.java       |   2 +-
 .../server/utils/TestShellCommandUtil.java      |   2 +-
 .../ambari/server/utils/TestVersionUtils.java   |   2 +-
 .../ambari/server/view/ClusterImplTest.java     |   4 +-
 .../ambari/server/view/DefaultMaskerTest.java   |   2 +-
 .../server/view/HttpImpersonatorImplTest.java   |   2 +-
 .../server/view/RemoteAmbariClusterTest.java    |   2 +-
 .../view/ViewAmbariStreamProviderTest.java      |   4 +-
 .../server/view/ViewArchiveUtilityTest.java     |   4 +-
 .../ambari/server/view/ViewClassLoaderTest.java |   2 +-
 .../ambari/server/view/ViewContextImplTest.java |   2 +-
 .../view/ViewDataMigrationContextImplTest.java  |   2 +-
 .../view/ViewDataMigrationUtilityTest.java      |   2 +-
 .../server/view/ViewDirectoryWatcherTest.java   |   2 +-
 .../ambari/server/view/ViewExtractorTest.java   |   2 +-
 .../view/ViewSubResourceDefinitionTest.java     |   2 +-
 .../view/ViewSubResourceProviderTest.java       |   2 +-
 .../server/view/ViewThrottleFilterTest.java     |   2 +-
 .../server/view/ViewURLStreamProviderTest.java  |   2 +-
 .../view/configuration/EntityConfigTest.java    |   2 +-
 .../view/configuration/InstanceConfigTest.java  |   2 +-
 .../view/configuration/ParameterConfigTest.java |   2 +-
 .../configuration/PermissionConfigTest.java     |   2 +-
 .../configuration/PersistenceConfigTest.java    |   2 +-
 .../view/configuration/PropertyConfigTest.java  |   2 +-
 .../view/configuration/ResourceConfigTest.java  |   2 +-
 .../view/configuration/ViewConfigTest.java      |   2 +-
 .../server/view/events/EventImplTest.java       |   2 +-
 .../InstanceValidationResultImplTest.java       |   4 +-
 .../validation/ValidationResultImplTest.java    |   4 +-
 .../stacks/2.0.6/YARN/test_historyserver.py     |   2 -
 .../app/controllers/main/host/add_controller.js |   3 -
 .../app/controllers/main/views_controller.js    |   4 +-
 ambari-web/app/controllers/wizard.js            |   9 +-
 ambari-web/app/models/view_instance.js          |   6 +-
 ambari-web/app/routes/add_host_routes.js        |  38 +++--
 ambari-web/app/styles/alerts.less               |  14 ++
 ambari-web/app/styles/application.less          |  13 +-
 ambari-web/app/styles/common.less               |   1 +
 ambari-web/app/styles/config_history_flow.less  |   7 +-
 .../app/styles/theme/bootstrap-ambari.css       |   2 +-
 .../app/templates/main/service/menu_item.hbs    |  11 +-
 ambari-web/app/views/main/menu.js               |   1 +
 ambari-web/app/views/main/service/menu.js       |   4 -
 .../main/host/add_controller_test.js            |  19 ---
 .../controllers/main/views_controller_test.js   |  14 +-
 ambari-web/test/controllers/wizard_test.js      |   4 -
 ambari-web/test/models/view_instance_test.js    |   6 +-
 ambari-web/test/views/main/service/menu_test.js |  12 --
 1940 files changed, 2468 insertions(+), 2450 deletions(-)
----------------------------------------------------------------------