ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Thu, 06 Jul 2017 13:10:43 GMT
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/406abf48
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/406abf48
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/406abf48

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 406abf48d39b343294f6073c7097b734598394a7
Parents: 43a8672 068f86a
Author: Nate Cole <ncole@hortonworks.com>
Authored: Thu Jul 6 09:09:43 2017 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Thu Jul 6 09:09:43 2017 -0400

----------------------------------------------------------------------
 .../controllers/ambariViews/ViewsListCtrl.js    |    20 +
 .../controllers/groups/GroupsEditCtrl.js        |    19 +-
 .../app/views/ambariViews/listTable.html        |     3 +
 .../ui/admin-web/app/views/groups/edit.html     |     3 +
 ambari-agent/conf/unix/install-helper.sh        |     8 +
 ambari-agent/etc/init.d/ambari-agent            |    22 +-
 ambari-agent/pom.xml                            |    17 +-
 .../src/main/package/rpm/posttrans_agent.sh     |     7 +
 .../ambari_agent/AlertSchedulerHandler.py       |    10 +-
 .../python/ambari_agent/alerts/base_alert.py    |     8 +-
 .../python/ambari_agent/alerts/port_alert.py    |   107 +-
 ambari-agent/src/packages/tarball/all.xml       |     2 +-
 .../ambari_agent/TestAlertSchedulerHandler.py   |    17 +-
 ambari-client/groovy-client/pom.xml             |     2 +
 .../libraries/functions/hive_check.py           |     5 +-
 .../libraries/functions/mounted_dirs_helper.py  |     1 +
 .../libraries/functions/packages_analyzer.py    |    15 +-
 .../libraries/providers/hdfs_resource.py        |     9 +-
 .../providers/modify_properties_file.py         |     9 +-
 ambari-funtest/pom.xml                          |     7 +-
 ambari-infra/ambari-infra-manager/pom.xml       |     1 -
 .../conf/batch/InfraManagerBatchConfig.java     |    11 +-
 .../ambari/infra/job/dummy/DummyItemWriter.java |    15 +-
 .../infra/job/dummy/DummyJobListener.java       |     7 +
 ambari-infra/ambari-infra-solr-client/pom.xml   |     2 +
 ambari-infra/ambari-infra-solr-plugin/pom.xml   |     4 +-
 ambari-infra/pom.xml                            |     6 +-
 .../ambari-logsearch-config-api/pom.xml         |     2 +-
 .../logsearch/config/api/LogSearchConfig.java   |    15 +-
 .../config/api/LogSearchConfigFactory.java      |     8 +-
 .../api/LogSearchPropertyDescription.java       |    59 +
 .../model/inputconfig/FilterGrokDescriptor.java |     2 +
 .../inputconfig/MapAnonymizeDescriptor.java     |    26 +
 .../model/inputconfig/MapDateDescriptor.java    |     2 +-
 .../model/inputconfig/MapFieldDescriptor.java   |     2 +-
 .../inputconfig/MapFieldValueDescriptor.java    |     2 +-
 .../config/api/LogSearchConfigClass1.java       |    11 +-
 .../config/api/LogSearchConfigClass2.java       |    11 +-
 .../config/api/LogSearchConfigFactoryTest.java  |     6 +-
 .../ambari-logsearch-config-zookeeper/pom.xml   |     2 +-
 .../config/zookeeper/LogSearchConfigZK.java     |    55 +-
 .../impl/FilterGrokDescriptorImpl.java          |     1 +
 .../impl/MapAnonymizeDescriptorImpl.java        |    57 +
 .../inputconfig/impl/PostMapValuesAdapter.java  |     3 +
 ambari-logsearch/ambari-logsearch-it/pom.xml    |     4 +-
 .../docs/postMapValues.md                       |     9 +
 .../ambari-logsearch-logfeeder/pom.xml          |    13 +-
 .../org/apache/ambari/logfeeder/LogFeeder.java  |    81 +-
 .../ambari/logfeeder/LogFeederCommandLine.java  |   168 +
 .../ambari/logfeeder/common/ConfigHandler.java  |    78 +-
 .../logfeeder/common/LogEntryParseTester.java   |   127 +
 .../logfeeder/common/LogFeederConstants.java    |     2 +-
 .../logfeeder/common/LogFeederException.java    |    31 +
 .../logfeeder/common/LogfeederException.java    |    31 -
 .../apache/ambari/logfeeder/filter/Filter.java  |     6 +-
 .../ambari/logfeeder/filter/FilterGrok.java     |    15 +-
 .../ambari/logfeeder/filter/FilterJSON.java     |     6 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java |     6 +-
 .../logfeeder/input/AbstractInputFile.java      |   148 +-
 .../apache/ambari/logfeeder/input/Input.java    |    83 +-
 .../logfeeder/input/InputConfigUploader.java    |    18 +-
 .../ambari/logfeeder/input/InputFile.java       |    23 +-
 .../ambari/logfeeder/input/InputManager.java    |   163 +-
 .../ambari/logfeeder/input/InputS3File.java     |    17 +-
 .../ambari/logfeeder/input/InputSimulate.java   |    74 +-
 .../loglevelfilter/LogLevelFilterHandler.java   |    28 +-
 .../logfeeder/mapper/MapperAnonymize.java       |   120 +
 .../logfeeder/metrics/LogFeederAMSClient.java   |    43 +-
 .../logfeeder/metrics/MetricsManager.java       |    25 +-
 .../ambari/logfeeder/output/OutputHDFSFile.java |    10 +-
 .../ambari/logfeeder/output/OutputS3File.java   |     2 +-
 .../ambari/logfeeder/output/OutputSolr.java     |    28 +-
 .../apache/ambari/logfeeder/util/AliasUtil.java |     6 +-
 .../apache/ambari/logfeeder/util/FileUtil.java  |    45 +-
 .../logfeeder/util/LogFeederHDFSUtil.java       |    77 +
 .../ambari/logfeeder/util/LogFeederUtil.java    |    67 +-
 .../logfeeder/util/LogfeederHDFSUtil.java       |    77 -
 .../apache/ambari/logfeeder/util/SSLUtil.java   |     9 +
 .../src/main/resources/alias_config.json        |     3 +
 .../src/main/scripts/run.sh                     |     4 +-
 .../ambari/logfeeder/filter/FilterJSONTest.java |     8 +-
 .../logfeeder/input/InputManagerTest.java       |    27 -
 .../logconfig/LogConfigHandlerTest.java         |     2 +-
 .../logfeeder/mapper/MapperAnonymizeTest.java   |    79 +
 .../logfeeder/metrics/MetrcisManagerTest.java   |   128 -
 .../logfeeder/metrics/MetricsManagerTest.java   |   126 +
 .../src/test/resources/log4j.xml                |     2 +-
 .../src/test/resources/logfeeder.properties     |     1 -
 .../ambari-logsearch-server/pom.xml             |    39 +-
 .../org/apache/ambari/logsearch/LogSearch.java  |    11 +-
 .../ambari/logsearch/common/ApiDocStorage.java  |    90 +
 .../logsearch/common/LogSearchConstants.java    |     2 +
 .../logsearch/common/PropertiesHelper.java      |    17 -
 .../common/PropertyDescriptionStorage.java      |   101 +
 .../ambari/logsearch/conf/ApiDocConfig.java     |     6 -
 .../logsearch/conf/ApplicationConfig.java       |     4 +-
 .../ambari/logsearch/conf/AuthPropsConfig.java  |   122 +
 .../conf/LogSearchHttpHeaderConfig.java         |    31 +
 .../ambari/logsearch/conf/SecurityConfig.java   |    19 +-
 .../logsearch/conf/SolrAuditLogPropsConfig.java |    76 +
 .../ambari/logsearch/conf/SolrConfig.java       |    12 +-
 .../conf/SolrConnectionPropsConfig.java         |    28 +
 .../conf/SolrEventHistoryPropsConfig.java       |   148 +
 .../logsearch/conf/SolrKerberosConfig.java      |    17 +
 .../conf/SolrServiceLogPropsConfig.java         |    38 +
 .../logsearch/conf/SolrUserPropsConfig.java     |   116 -
 .../conf/global/SolrEventHistoryState.java      |    60 +
 .../conf/global/SolrUserConfigState.java        |    60 -
 .../configurer/LogSearchConfigConfigurer.java   |     2 +-
 .../EventHistoryRequestQueryConverter.java      |    67 +
 .../UserConfigRequestQueryConverter.java        |    67 -
 .../logsearch/dao/EventHistorySolrDao.java      |   117 +
 .../logsearch/dao/SolrSchemaFieldDao.java       |     8 +-
 .../ambari/logsearch/dao/UserConfigSolrDao.java |   117 -
 .../ambari/logsearch/doc/DocConstants.java      |    17 +-
 .../logsearch/manager/EventHistoryManager.java  |   199 +
 .../ambari/logsearch/manager/InfoManager.java   |    59 +
 .../ambari/logsearch/manager/PublicManager.java |    48 -
 .../logsearch/manager/ShipperConfigManager.java |    24 +
 .../logsearch/manager/UserConfigManager.java    |   199 -
 .../logsearch/model/common/LSServerMapDate.java |     3 -
 .../model/common/LSServerMapField.java          |     3 +
 .../model/common/LSServerMapFieldAnonymize.java |    65 +
 .../LSServerPostMapValuesListDeserializer.java  |     4 +
 .../request/EventHistoryParamDefinition.java    |    38 +
 .../request/UserConfigParamDefinition.java      |    38 -
 .../model/request/impl/EventHistoryRequest.java |    53 +
 .../model/request/impl/UserConfigRequest.java   |    53 -
 .../model/response/EventHistoryData.java        |    97 +
 .../response/EventHistoryDataListResponse.java  |    55 +
 .../model/response/PropertyDescriptionData.java |    62 +
 .../model/response/UserConfigData.java          |    97 -
 .../response/UserConfigDataListResponse.java    |    55 -
 .../logsearch/rest/EventHistoryResource.java    |    82 +
 .../ambari/logsearch/rest/InfoResource.java     |    73 +
 .../ambari/logsearch/rest/PublicResource.java   |    48 -
 .../logsearch/rest/ShipperConfigResource.java   |    12 +
 .../ambari/logsearch/rest/StatusResource.java   |    16 +-
 .../ambari/logsearch/rest/SwaggerResource.java  |    56 +
 .../logsearch/rest/UserConfigResource.java      |    82 -
 .../ambari/logsearch/solr/SolrConstants.java    |     4 +-
 .../apache/ambari/logsearch/util/SSLUtil.java   |    25 +
 .../LogsearchEventHistoryStateFilter.java       |    52 +
 .../LogsearchKRBAuthenticationFilter.java       |    69 +-
 .../filters/LogsearchUserConfigStateFilter.java |    52 -
 ...rchExternalServerAuthenticationProvider.java |    23 +-
 .../src/main/resources/default.properties       |     2 -
 .../src/main/resources/logsearch.properties     |     3 -
 .../EventHistoryRequestQueryConverterTest.java  |    50 +
 .../UserConfigRequestQueryConverterTest.java    |    50 -
 ...xternalServerAuthenticationProviderTest.java |     4 +
 .../src/main/webapp/login.html                  |    19 +-
 .../collection_bases/VEventHistoryListBase.js   |     8 +-
 .../scripts/model_bases/VUserFilterBase.js      |     2 +-
 .../main/webapp/scripts/views/common/Header.js  |     2 +-
 .../shipper-conf/input.config-hst.json          |     4 +-
 .../shipper-conf/input.config-zookeeper.json    |     4 +-
 .../logsearch/logsearch-https.properties        |     4 -
 ambari-logsearch/pom.xml                        |     9 +-
 ambari-metrics/ambari-metrics-common/pom.xml    |     4 +
 .../timeline/AbstractTimelineMetricsSink.java   |    79 +-
 .../metrics2/sink/timeline/Precision.java       |     2 +-
 .../cache/HandleConnectExceptionTest.java       |    86 +-
 .../ambari-metrics/datasource.js                |     5 +-
 .../ambari-metrics-host-monitoring/pom.xml      |     1 +
 .../ambari-metrics-timelineservice/pom.xml      |     8 +-
 .../timeline/HBaseTimelineMetricStore.java      |    15 +-
 .../timeline/TimelineMetricConfiguration.java   |    21 +
 .../timeline/TestTimelineMetricStore.java       |     1 +
 ambari-metrics/pom.xml                          |    81 +-
 ambari-project/pom.xml                          |    72 +-
 ambari-server/checkstyle.xml                    |     6 +-
 ambari-server/docs/configuration/index.md       |    13 +-
 ambari-server/pom.xml                           |   205 +-
 ambari-server/sbin/ambari-server                |     6 +-
 ambari-server/src/main/assemblies/server.xml    |     4 +
 .../actionmanager/ActionDBAccessorImpl.java     |    17 +
 .../server/agent/AlertDefinitionCommand.java    |     7 +-
 .../ambari/server/agent/ExecutionCommand.java   |     4 +
 .../ambari/server/agent/HeartBeatHandler.java   |     4 +-
 .../ambari/server/agent/rest/AgentResource.java |     7 +-
 .../server/api/rest/BootStrapResource.java      |    10 +-
 .../ambari/server/api/rest/HealthCheck.java     |     8 +-
 .../api/rest/KdcServerReachabilityCheck.java    |    10 +-
 .../api/services/AlertDefinitionService.java    |    13 +-
 .../server/api/services/AlertGroupService.java  |    11 +-
 .../api/services/AlertHistoryService.java       |     5 +-
 .../server/api/services/AlertNoticeService.java |     5 +-
 .../server/api/services/AlertService.java       |     7 +-
 .../server/api/services/AlertTargetService.java |    11 +-
 .../server/api/services/AmbariMetaInfo.java     |   114 -
 .../ClusterKerberosDescriptorService.java       |     6 +-
 .../server/api/services/ClusterService.java     |     2 +-
 .../services/ClusterStackVersionService.java    |    12 +-
 .../CompatibleRepositoryVersionService.java     |     5 +-
 .../server/api/services/ComponentService.java   |    15 +-
 .../server/api/services/ConfigGroupService.java |    12 +-
 .../api/services/ConfigurationService.java      |     5 +-
 .../server/api/services/CredentialService.java  |    11 +-
 .../api/services/ExtensionLinksService.java     |    13 +-
 .../server/api/services/ExtensionsService.java  |    11 +-
 .../ambari/server/api/services/FeedService.java |    11 +-
 .../api/services/HostComponentService.java      |    20 +-
 .../services/HostKerberosIdentityService.java   |     5 +-
 .../api/services/HostStackVersionService.java   |     7 +-
 .../server/api/services/InstanceService.java    |    11 +-
 .../ambari/server/api/services/JobService.java  |     5 +-
 .../api/services/KerberosDescriptorService.java |     9 +-
 .../ambari/server/api/services/KeyService.java  |     3 +-
 .../api/services/LdapSyncEventService.java      |    12 +-
 .../server/api/services/LoggingService.java     |     6 +-
 .../server/api/services/LogoutService.java      |     3 +-
 .../api/services/OperatingSystemService.java    |     5 +-
 .../server/api/services/PermissionService.java  |    12 +-
 .../api/services/PersistKeyValueService.java    |     9 +-
 .../api/services/PreUpgradeCheckService.java    |     3 +-
 .../server/api/services/PrivilegeService.java   |    17 +-
 .../api/services/RecommendationService.java     |     3 +-
 .../api/services/RemoteClustersService.java     |    18 +-
 .../server/api/services/RepositoryService.java  |    11 +-
 .../api/services/RepositoryVersionService.java  |    11 +-
 .../api/services/RequestScheduleService.java    |    11 +-
 .../api/services/RoleAuthorizationService.java  |     5 +-
 .../services/ServiceConfigVersionService.java   |     4 +-
 .../server/api/services/ServiceService.java     |     3 +-
 .../server/api/services/StageService.java       |    13 +-
 .../api/services/TargetClusterService.java      |    11 +-
 .../server/api/services/TaskAttemptService.java |     5 +-
 .../ambari/server/api/services/TaskService.java |     5 +-
 .../api/services/UpgradeGroupService.java       |     5 +-
 .../server/api/services/UpgradeItemService.java |     7 +-
 .../server/api/services/UpgradeService.java     |    11 +-
 .../api/services/UpgradeSummaryService.java     |     6 +-
 .../server/api/services/ValidationService.java  |     3 +-
 .../api/services/VersionDefinitionService.java  |    11 +-
 .../server/api/services/ViewUrlsService.java    |    18 +-
 .../api/services/WidgetLayoutService.java       |    15 +-
 .../server/api/services/WidgetService.java      |    15 +-
 .../server/api/services/WorkflowService.java    |     5 +-
 .../api/services/groups/GroupService.java       |     4 +-
 .../api/services/groups/MemberService.java      |     5 +-
 .../stackadvisor/StackAdvisorHelper.java        |    74 +-
 .../stackadvisor/StackAdvisorRunner.java        |   207 +-
 .../ComponentLayoutRecommendationCommand.java   |     5 +-
 .../ComponentLayoutValidationCommand.java       |    11 +-
 ...rationDependenciesRecommendationCommand.java |    11 +-
 .../ConfigurationRecommendationCommand.java     |    11 +-
 .../ConfigurationValidationCommand.java         |    11 +-
 .../commands/StackAdvisorCommand.java           |    15 +-
 .../server/api/services/users/UserService.java  |     3 +-
 .../views/ViewExternalSubResourceService.java   |     5 +-
 .../api/services/views/ViewInstanceService.java |     7 +-
 .../services/views/ViewPermissionService.java   |     9 +-
 .../services/views/ViewPrivilegeService.java    |     8 +-
 .../server/api/services/views/ViewService.java  |    10 +-
 .../api/services/views/ViewVersionService.java  |    11 +-
 .../checks/DatabaseConsistencyCheckHelper.java  |    18 +-
 .../ambari/server/cleanup/CleanupDriver.java    |    15 +-
 .../ambari/server/cleanup/CleanupService.java   |    19 +-
 .../server/cleanup/CleanupServiceImpl.java      |    33 +-
 .../server/configuration/Configuration.java     |    65 +-
 .../controller/AmbariActionExecutionHelper.java |     2 +
 .../AmbariCustomCommandExecutionHelper.java     |    38 +-
 .../controller/AmbariManagementController.java  |    13 +-
 .../AmbariManagementControllerImpl.java         |    83 +-
 .../ambari/server/controller/AmbariServer.java  |     4 +
 .../server/controller/AuthToLocalBuilder.java   |    10 +-
 .../server/controller/ConfigGroupResponse.java  |    10 +
 .../controller/DeleteIdentityHandler.java       |   283 +
 .../server/controller/KerberosHelper.java       |     3 +
 .../server/controller/KerberosHelperImpl.java   |    37 +-
 .../OrderedRequestStageContainer.java           |    62 +
 .../server/controller/RepositoryResponse.java   |    12 +-
 .../internal/AbstractProviderModule.java        |    47 +-
 .../internal/ClientConfigResourceProvider.java  |     9 +-
 .../internal/ConfigGroupResourceProvider.java   |    31 +-
 .../internal/ProvisionClusterRequest.java       |     5 +-
 .../internal/RepositoryResourceProvider.java    |    11 -
 .../RepositoryVersionResourceProvider.java      |    14 -
 .../internal/RequestResourceProvider.java       |    12 +-
 .../internal/UpgradeResourceProvider.java       |    12 +-
 .../server/controller/jmx/JMXHostProvider.java  |    11 +
 .../controller/jmx/JMXPropertyProvider.java     |    24 +
 .../utilities/KerberosIdentityCleaner.java      |   135 +
 .../system/impl/AmbariMetricSinkImpl.java       |     3 +
 .../system/impl/DatabaseMetricsSource.java      |     4 +-
 .../metrics/system/impl/JvmMetricsSource.java   |    12 +-
 .../metrics/system/impl/MetricsServiceImpl.java |     5 +-
 .../apache/ambari/server/orm/DBAccessor.java    |    41 +-
 .../ambari/server/orm/DBAccessorImpl.java       |   123 +-
 .../server/orm/dao/HostRoleCommandDAO.java      |     7 +-
 .../ambari/server/orm/dao/RequestDAO.java       |    21 +-
 .../server/orm/dao/TopologyHostTaskDAO.java     |     8 +-
 .../orm/dao/TopologyLogicalRequestDAO.java      |     8 +-
 .../server/orm/dao/TopologyLogicalTaskDAO.java  |     8 +-
 .../orm/entities/TopologyHostTaskEntity.java    |     2 +-
 .../entities/TopologyLogicalRequestEntity.java  |     2 +-
 .../orm/entities/TopologyLogicalTaskEntity.java |     2 +-
 .../server/orm/helpers/dbms/DbmsHelper.java     |    10 +
 .../orm/helpers/dbms/GenericDbmsHelper.java     |    12 +
 .../server/orm/helpers/dbms/H2Helper.java       |    10 +
 .../ambari/server/proxy/ProxyService.java       |     9 +-
 .../server/resources/api/rest/GetResource.java  |     5 +-
 .../unsecured/rest/CertificateDownload.java     |     5 +-
 .../unsecured/rest/CertificateSign.java         |     4 +-
 .../security/unsecured/rest/ConnectionInfo.java |     5 +-
 .../AbstractPrepareKerberosServerAction.java    |    19 +-
 .../server/serveraction/kerberos/Component.java |    74 +
 .../kerberos/FinalizeKerberosServerAction.java  |    27 +-
 .../kerberos/KerberosServerAction.java          |    27 +
 .../ambari/server/stack/ComponentModule.java    |     4 +
 .../ambari/server/stack/MasterHostResolver.java |    11 +-
 .../ambari/server/stack/ServiceModule.java      |     4 +
 .../ambari/server/stack/StackContext.java       |    28 -
 .../apache/ambari/server/stack/StackModule.java |    32 -
 .../state/ClientConfigFileDefinition.java       |    15 +-
 .../org/apache/ambari/server/state/Cluster.java |     8 +
 .../apache/ambari/server/state/ConfigImpl.java  |     3 +-
 .../ambari/server/state/RepositoryInfo.java     |    20 +-
 .../apache/ambari/server/state/ServiceInfo.java |    26 +-
 .../server/state/alert/AlertDefinitionHash.java |    14 +-
 .../server/state/cluster/ClusterImpl.java       |    18 +
 .../server/state/cluster/ClustersImpl.java      |    25 +-
 .../kerberos/AbstractKerberosDescriptor.java    |    15 +
 .../kerberos/KerberosComponentDescriptor.java   |    15 +
 .../state/kerberos/KerberosDescriptor.java      |     8 -
 .../kerberos/KerberosIdentityDescriptor.java    |    30 +
 .../kerberos/KerberosServiceDescriptor.java     |     6 +
 .../services/AlertNoticeDispatchService.java    |    86 +-
 .../server/state/stack/LatestRepoCallable.java  |    47 -
 .../server/state/stack/RepositoryXml.java       |     6 -
 .../state/stack/upgrade/ClusterGrouping.java    |     4 +-
 .../server/state/stack/upgrade/ExecuteTask.java |     2 +-
 .../server/state/stack/upgrade/Grouping.java    |     2 +-
 .../state/stack/upgrade/StageWrapper.java       |     2 +-
 .../ambari/server/topology/HostRequest.java     |    12 +-
 .../ambari/server/topology/LogicalRequest.java  |    35 +-
 .../ambari/server/topology/PersistedState.java  |     7 +-
 .../server/topology/PersistedStateImpl.java     |    18 +-
 .../ambari/server/topology/TopologyManager.java |    70 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |    13 -
 .../server/upgrade/UpgradeCatalog200.java       |   613 -
 .../server/upgrade/UpgradeCatalog210.java       |  1765 -
 .../server/upgrade/UpgradeCatalog211.java       |   295 -
 .../server/upgrade/UpgradeCatalog212.java       |   427 -
 .../server/upgrade/UpgradeCatalog2121.java      |   206 -
 .../server/upgrade/UpgradeCatalog220.java       |  1404 -
 .../server/upgrade/UpgradeCatalog221.java       |   456 -
 .../server/upgrade/UpgradeCatalog222.java       |   781 -
 .../server/upgrade/UpgradeCatalog230.java       |   402 -
 .../server/upgrade/UpgradeCatalog240.java       |  3079 --
 .../server/upgrade/UpgradeCatalog2402.java      |   121 -
 .../server/upgrade/UpgradeCatalog242.java       |   272 -
 .../server/upgrade/UpgradeCatalog250.java       |  1352 -
 .../server/upgrade/UpgradeCatalog251.java       |     3 +-
 .../server/upgrade/UpgradeCatalog300.java       |     5 +-
 .../apache/ambari/server/utils/StageUtils.java  |    62 +-
 ambari-server/src/main/python/ambari-server.py  |    20 +-
 .../src/main/python/ambari_server/dbCleanup.py  |    34 +-
 .../ambari_server/dbConfiguration_linux.py      |    34 +-
 .../python/ambari_server/serverConfiguration.py |     6 +
 .../main/python/ambari_server/serverSetup.py    |   105 +-
 .../main/python/ambari_server/serverUpgrade.py  |    22 +-
 .../main/python/ambari_server/setupActions.py   |     2 +-
 .../main/python/ambari_server/setupSecurity.py  |     4 -
 ambari-server/src/main/python/upgradeHelper.py  |  2338 -
 .../1.6.1.2.2.0/configuration/accumulo-env.xml  |     5 +
 .../package/scripts/accumulo_configuration.py   |     3 +
 .../1.6.1.2.2.0/package/scripts/params.py       |     5 +-
 .../package/templates/accumulo_jaas.conf.j2     |    29 +
 .../0.1.0/package/scripts/params.py             |     4 +-
 .../AMBARI_INFRA/0.1.0/service_advisor.py       |   133 +
 .../0.1.0/package/scripts/params.py             |    10 +-
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |     8 +-
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |     5 +-
 .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml |     6 +
 .../ATLAS/0.7.0.3.0/package/scripts/params.py   |     4 +-
 .../1.4.0.2.0/configuration/flume-log4j.xml     |    96 +
 .../FLUME/1.4.0.2.0/package/scripts/flume.py    |     4 +-
 .../HBASE/0.96.0.2.0/role_command_order.json    |     3 +-
 .../HBASE/2.0.0.3.0/role_command_order.json     |     2 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |     4 -
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |    14 +-
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |     2 +-
 .../package/scripts/namenode_upgrade.py         |     2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |     8 +-
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml |     4 -
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |    10 +-
 .../HDFS/3.0.0.3.0/package/scripts/namenode.py  |     2 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |     2 +
 .../HDFS/3.0.0.3.0/service_advisor.py           |    53 +
 .../HIVE/0.12.0.2.0/metainfo.xml                |    20 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |     8 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |     5 +
 .../2.1.0.3.0/configuration/parquet-logging.xml |   106 +
 .../configuration/ranger-hive-security.xml      |     9 +
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml |     7 +
 .../HIVE/2.1.0.3.0/package/scripts/hive.py      |    40 +-
 .../2.1.0.3.0/package/scripts/params_linux.py   |     5 +
 .../HIVE/2.1.0.3.0/service_advisor.py           |    19 +
 .../KAFKA/0.10.0.3.0/kerberos.json              |     3 +
 .../common-services/KAFKA/0.10.0/kerberos.json  |     3 +
 .../common-services/KAFKA/0.9.0/kerberos.json   |     3 +
 .../LOGSEARCH/0.5.0/metainfo.xml                |    24 -
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |     5 +-
 .../package/templates/input.config-nifi.json.j2 |    79 -
 .../LOGSEARCH/0.5.0/service_advisor.py          |   195 +
 .../PXF/3.0.0/configuration/pxf-profiles.xml    |    25 +
 .../RANGER/0.4.0/package/scripts/params.py      |     5 +-
 .../0.4.0/package/scripts/ranger_admin.py       |    11 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |    35 +-
 .../0.5.0/configuration/ranger-ugsync-site.xml  |     3 +
 .../RANGER/0.7.0.3.0/alerts.json                |    76 -
 .../0.7.0.3.0/configuration/admin-log4j.xml     |   132 -
 .../configuration/admin-properties.xml          |   163 -
 .../configuration/atlas-tagsync-ssl.xml         |    72 -
 .../configuration/ranger-admin-site.xml         |   785 -
 .../0.7.0.3.0/configuration/ranger-env.xml      |   513 -
 .../0.7.0.3.0/configuration/ranger-site.xml     |    30 -
 .../configuration/ranger-solr-configuration.xml |    59 -
 .../ranger-tagsync-policymgr-ssl.xml            |    72 -
 .../configuration/ranger-tagsync-site.xml       |   206 -
 .../configuration/ranger-ugsync-site.xml        |   574 -
 .../tagsync-application-properties.xml          |    62 -
 .../0.7.0.3.0/configuration/tagsync-log4j.xml   |    90 -
 .../0.7.0.3.0/configuration/usersync-log4j.xml  |    89 -
 .../configuration/usersync-properties.xml       |    32 -
 .../RANGER/0.7.0.3.0/kerberos.json              |   153 -
 .../RANGER/0.7.0.3.0/metainfo.xml               |   189 -
 .../alerts/alert_ranger_admin_passwd_check.py   |   195 -
 .../RANGER/0.7.0.3.0/package/scripts/params.py  |   448 -
 .../0.7.0.3.0/package/scripts/ranger_admin.py   |   217 -
 .../0.7.0.3.0/package/scripts/ranger_service.py |    69 -
 .../0.7.0.3.0/package/scripts/ranger_tagsync.py |   139 -
 .../package/scripts/ranger_usersync.py          |   124 -
 .../0.7.0.3.0/package/scripts/service_check.py  |    49 -
 .../0.7.0.3.0/package/scripts/setup_ranger.py   |   153 -
 .../package/scripts/setup_ranger_xml.py         |   853 -
 .../0.7.0.3.0/package/scripts/status_params.py  |    39 -
 .../RANGER/0.7.0.3.0/package/scripts/upgrade.py |    31 -
 .../templates/input.config-ranger.json.j2       |    79 -
 .../package/templates/ranger_admin_pam.j2       |    22 -
 .../package/templates/ranger_remote_pam.j2      |    22 -
 .../package/templates/ranger_solr_jaas_conf.j2  |    26 -
 .../properties/ranger-solrconfig.xml.j2         |  1874 -
 .../RANGER/0.7.0.3.0/quicklinks/quicklinks.json |    41 -
 .../RANGER/0.7.0.3.0/role_command_order.json    |     9 -
 .../RANGER/0.7.0.3.0/service_advisor.py         |   793 -
 .../0.7.0.3.0/themes/theme_version_1.json       |   722 -
 .../0.7.0.3.0/themes/theme_version_2.json       |  1470 -
 .../0.7.0.3.0/themes/theme_version_3.json       |   692 -
 .../0.7.0.3.0/themes/theme_version_5.json       |    48 -
 .../RANGER/1.0.0.3.0/alerts.json                |    76 +
 .../1.0.0.3.0/configuration/admin-log4j.xml     |   132 +
 .../configuration/admin-properties.xml          |   161 +
 .../configuration/atlas-tagsync-ssl.xml         |    72 +
 .../configuration/ranger-admin-site.xml         |   751 +
 .../1.0.0.3.0/configuration/ranger-env.xml      |   503 +
 .../configuration/ranger-solr-configuration.xml |    59 +
 .../ranger-tagsync-policymgr-ssl.xml            |    72 +
 .../configuration/ranger-tagsync-site.xml       |   201 +
 .../configuration/ranger-ugsync-site.xml        |   571 +
 .../tagsync-application-properties.xml          |    62 +
 .../1.0.0.3.0/configuration/tagsync-log4j.xml   |    90 +
 .../1.0.0.3.0/configuration/usersync-log4j.xml  |    89 +
 .../RANGER/1.0.0.3.0/kerberos.json              |   153 +
 .../RANGER/1.0.0.3.0/metainfo.xml               |   177 +
 .../alerts/alert_ranger_admin_passwd_check.py   |   195 +
 .../RANGER/1.0.0.3.0/package/scripts/params.py  |   449 +
 .../1.0.0.3.0/package/scripts/ranger_admin.py   |   210 +
 .../1.0.0.3.0/package/scripts/ranger_service.py |    69 +
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py |   139 +
 .../package/scripts/ranger_usersync.py          |   120 +
 .../1.0.0.3.0/package/scripts/service_check.py  |    49 +
 .../package/scripts/setup_ranger_xml.py         |   853 +
 .../1.0.0.3.0/package/scripts/status_params.py  |    39 +
 .../RANGER/1.0.0.3.0/package/scripts/upgrade.py |    31 +
 .../templates/input.config-ranger.json.j2       |    79 +
 .../package/templates/ranger_admin_pam.j2       |    22 +
 .../package/templates/ranger_remote_pam.j2      |    22 +
 .../package/templates/ranger_solr_jaas_conf.j2  |    26 +
 .../properties/ranger-solrconfig.xml.j2         |  1874 +
 .../RANGER/1.0.0.3.0/quicklinks/quicklinks.json |    41 +
 .../RANGER/1.0.0.3.0/role_command_order.json    |     9 +
 .../RANGER/1.0.0.3.0/service_advisor.py         |   774 +
 .../1.0.0.3.0/themes/theme_version_1.json       |  1821 +
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |     8 +
 .../0.5.0.2.3/package/scripts/kms_server.py     |    10 +-
 .../RANGER_KMS/0.5.0.3.0/alerts.json            |    32 -
 .../0.5.0.3.0/configuration/dbks-site.xml       |   206 -
 .../0.5.0.3.0/configuration/kms-env.xml         |   116 -
 .../0.5.0.3.0/configuration/kms-log4j.xml       |   120 -
 .../0.5.0.3.0/configuration/kms-properties.xml  |   166 -
 .../0.5.0.3.0/configuration/kms-site.xml        |   133 -
 .../configuration/ranger-kms-audit.xml          |   124 -
 .../configuration/ranger-kms-policymgr-ssl.xml  |    68 -
 .../configuration/ranger-kms-security.xml       |    64 -
 .../0.5.0.3.0/configuration/ranger-kms-site.xml |   104 -
 .../RANGER_KMS/0.5.0.3.0/kerberos.json          |    84 -
 .../RANGER_KMS/0.5.0.3.0/metainfo.xml           |   115 -
 .../RANGER_KMS/0.5.0.3.0/package/scripts/kms.py |   677 -
 .../0.5.0.3.0/package/scripts/kms_server.py     |   117 -
 .../0.5.0.3.0/package/scripts/kms_service.py    |    58 -
 .../0.5.0.3.0/package/scripts/params.py         |   331 -
 .../0.5.0.3.0/package/scripts/service_check.py  |    41 -
 .../0.5.0.3.0/package/scripts/status_params.py  |    36 -
 .../0.5.0.3.0/package/scripts/upgrade.py        |    30 -
 .../templates/input.config-ranger-kms.json.j2   |    48 -
 .../0.5.0.3.0/role_command_order.json           |     7 -
 .../RANGER_KMS/0.5.0.3.0/service_advisor.py     |   281 -
 .../0.5.0.3.0/themes/theme_version_1.json       |   303 -
 .../0.5.0.3.0/themes/theme_version_2.json       |   124 -
 .../RANGER_KMS/1.0.0.3.0/alerts.json            |    32 +
 .../1.0.0.3.0/configuration/dbks-site.xml       |   206 +
 .../1.0.0.3.0/configuration/kms-env.xml         |   115 +
 .../1.0.0.3.0/configuration/kms-log4j.xml       |   120 +
 .../1.0.0.3.0/configuration/kms-properties.xml  |   166 +
 .../1.0.0.3.0/configuration/kms-site.xml        |   133 +
 .../configuration/ranger-kms-audit.xml          |   118 +
 .../configuration/ranger-kms-policymgr-ssl.xml  |    68 +
 .../configuration/ranger-kms-security.xml       |    64 +
 .../1.0.0.3.0/configuration/ranger-kms-site.xml |   110 +
 .../RANGER_KMS/1.0.0.3.0/kerberos.json          |    84 +
 .../RANGER_KMS/1.0.0.3.0/metainfo.xml           |   111 +
 .../RANGER_KMS/1.0.0.3.0/package/scripts/kms.py |   675 +
 .../1.0.0.3.0/package/scripts/kms_server.py     |   117 +
 .../1.0.0.3.0/package/scripts/kms_service.py    |    58 +
 .../1.0.0.3.0/package/scripts/params.py         |   331 +
 .../1.0.0.3.0/package/scripts/service_check.py  |    41 +
 .../1.0.0.3.0/package/scripts/status_params.py  |    36 +
 .../1.0.0.3.0/package/scripts/upgrade.py        |    30 +
 .../templates/input.config-ranger-kms.json.j2   |    48 +
 .../1.0.0.3.0/role_command_order.json           |     7 +
 .../RANGER_KMS/1.0.0.3.0/service_advisor.py     |   358 +
 .../1.0.0.3.0/themes/theme_version_1.json       |   409 +
 .../common-services/YARN/2.1.0.2.0/metainfo.xml |     1 +
 .../common-services/YARN/3.0.0.3.0/metainfo.xml |     1 +
 .../0.6.0.2.5/configuration/zeppelin-config.xml |     7 +
 .../0.6.0.2.5/configuration/zeppelin-env.xml    |     5 +
 .../scripts/interpreter_json_template.py        |   361 +
 .../0.6.0.2.5/package/scripts/master.py         |    38 +-
 .../0.6.0.2.5/package/scripts/params.py         |    23 +
 .../custom_actions/scripts/install_packages.py  |     6 +
 .../HDP/2.0.6/configuration/cluster-env.xml     |    12 +
 .../2.0.6/hooks/before-ANY/scripts/params.py    |     2 +
 .../before-ANY/scripts/shared_initialization.py |    30 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |     4 +
 .../scripts/shared_initialization.py            |    22 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |    66 -
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |    10 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |     7 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |     5 +-
 .../services/ATLAS/configuration/atlas-env.xml  |     6 +
 .../HIVE/configuration/parquet-logging.xml      |   106 +
 .../HIVE/configuration/ranger-hive-security.xml |    33 +
 .../configuration/spark-thrift-sparkconf.xml    |    40 +
 .../configuration/spark2-thrift-sparkconf.xml   |    40 +
 .../YARN/configuration-mapred/mapred-site.xml   |     2 +-
 .../services/YARN/configuration/yarn-env.xml    |    15 +-
 .../services/YARN/configuration/yarn-site.xml   |     6 +
 .../HDP/2.6/services/ZEPPELIN/metainfo.xml      |     2 +-
 .../stacks/HDP/2.6/services/stack_advisor.py    |    57 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |    43 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |    36 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |    34 +-
 .../HDP/3.0/configuration/cluster-env.xml       |    12 +
 .../HDP/3.0/hooks/before-ANY/scripts/params.py  |     3 +
 .../before-ANY/scripts/shared_initialization.py |    31 +-
 .../3.0/hooks/before-INSTALL/scripts/params.py  |     2 +
 .../scripts/repo_initialization.py              |     8 +
 .../3.0/hooks/before-START/scripts/params.py    |     4 +
 .../scripts/shared_initialization.py            |    22 +-
 .../main/resources/stacks/HDP/3.0/metainfo.xml  |     2 +-
 .../stacks/HDP/3.0/services/RANGER/metainfo.xml |     4 +-
 .../HDP/3.0/services/RANGER_KMS/metainfo.xml    |     4 +-
 .../HDP/3.0/services/ZEPPELIN/metainfo.xml      |     2 +-
 .../PERF/1.0/hooks/before-ANY/scripts/params.py |     3 +
 .../before-ANY/scripts/shared_initialization.py |    23 +-
 .../src/main/resources/stacks/stack_advisor.py  |     7 +-
 .../catalog/UpgradeCatalog_1.3_to_2.2.json      |   948 -
 .../catalog/UpgradeCatalog_2.0_to_2.2.2.json    |   408 -
 .../catalog/UpgradeCatalog_2.0_to_2.2.4.json    |   453 -
 .../catalog/UpgradeCatalog_2.0_to_2.2.json      |   275 -
 .../catalog/UpgradeCatalog_2.1_to_2.2.2.json    |   465 -
 .../catalog/UpgradeCatalog_2.1_to_2.2.4.json    |   499 -
 .../catalog/UpgradeCatalog_2.1_to_2.2.json      |   292 -
 .../catalog/UpgradeCatalog_2.1_to_2.3.json      |   440 -
 .../catalog/UpgradeCatalog_2.2_to_2.3.json      |  2234 -
 .../UpgradeCatalog_2.2_to_2.3_step2.json        |    81 -
 .../server/api/services/AmbariMetaInfoTest.java |   242 +-
 .../stackadvisor/StackAdvisorHelperTest.java    |    63 +-
 .../stackadvisor/StackAdvisorRunnerTest.java    |    10 +-
 .../ConfigurationRecommendationCommandTest.java |     3 +-
 .../commands/StackAdvisorCommandTest.java       |    47 +-
 .../server/cleanup/CleanupServiceImplTest.java  |    43 +-
 .../AmbariManagementControllerImplTest.java     |    16 +-
 .../AmbariManagementControllerTest.java         |   205 -
 .../server/controller/KerberosHelperTest.java   |     6 +-
 .../ClientConfigResourceProviderTest.java       |    10 +-
 .../ConfigGroupResourceProviderTest.java        |     2 +
 .../internal/ProvisionClusterRequestTest.java   |    13 +-
 .../RepositoryResourceProviderTest.java         |     5 +-
 .../internal/RequestResourceProviderTest.java   |    11 +-
 .../internal/UpgradeResourceProviderTest.java   |     2 +-
 .../metrics/JMXPropertyProviderTest.java        |     9 +
 .../utilities/KerberosIdentityCleanerTest.java  |   204 +
 .../ambari/server/orm/DBAccessorImplTest.java   |    90 +
 .../ComponentVersionCheckActionTest.java        |     2 +-
 .../server/stack/ComponentModuleTest.java       |    25 +
 .../ambari/server/stack/ServiceModuleTest.java  |    31 +
 .../state/alerts/AlertDefinitionHashTest.java   |     4 +-
 .../server/state/cluster/ClustersTest.java      |    13 +-
 .../AlertNoticeDispatchServiceTest.java         |    23 +
 .../server/topology/LogicalRequestTest.java     |    82 +-
 .../server/upgrade/UpgradeCatalog200Test.java   |   915 -
 .../server/upgrade/UpgradeCatalog210Test.java   |  1360 -
 .../server/upgrade/UpgradeCatalog211Test.java   |   446 -
 .../server/upgrade/UpgradeCatalog2121Test.java  |   161 -
 .../server/upgrade/UpgradeCatalog212Test.java   |   694 -
 .../server/upgrade/UpgradeCatalog220Test.java   |  1535 -
 .../server/upgrade/UpgradeCatalog221Test.java   |   614 -
 .../server/upgrade/UpgradeCatalog222Test.java   |  1180 -
 .../server/upgrade/UpgradeCatalog230Test.java   |   317 -
 .../server/upgrade/UpgradeCatalog240Test.java   |  2688 -
 .../server/upgrade/UpgradeCatalog242Test.java   |   430 -
 .../server/upgrade/UpgradeCatalog250Test.java   |  2129 -
 .../server/upgrade/UpgradeCatalog300Test.java   |     2 +-
 .../server/upgrade/UpgradeCatalogTest.java      |    13 +-
 .../ambari/server/utils/StageUtilsTest.java     |    99 +
 .../view/persistence/DataStoreImplTest.java     |     4 +-
 .../src/test/python/TestAmbariServer.py         |    97 +-
 .../src/test/python/TestUpgradeHelper.py        |  1028 -
 .../LOGSEARCH/test_service_advisor.py           |   164 +
 .../python/stacks/2.0.6/FLUME/test_flume.py     |    10 +-
 .../2.0.6/HIVE/test_hive_service_check.py       |    14 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |     2 +-
 .../configs/ha_bootstrap_standby_node.json      |     2 +-
 ...ha_bootstrap_standby_node_initial_start.json |     2 +-
 ...dby_node_initial_start_dfs_nameservices.json |     2 +-
 .../stacks/2.2/RANGER/test_ranger_admin.py      |     8 +
 .../stacks/2.3/common/test_stack_advisor.py     |   123 -
 .../stacks/2.5/RANGER/test_ranger_admin.py      |    10 +
 .../stacks/2.5/RANGER_KMS/test_kms_server.py    |    10 +
 .../stacks/2.5/common/test_stack_advisor.py     |     2 +-
 .../stacks/2.6/RANGER/test_ranger_admin.py      |    10 +
 .../stacks/2.6/common/test_stack_advisor.py     |   123 +-
 .../test/python/stacks/2.6/configs/default.json |     3 +-
 ambari-serviceadvisor/pom.xml                   |   124 +
 .../ambari/serviceadvisor/ServiceAdvisor.java   |   147 +
 .../ServiceAdvisorCommandType.java              |    63 +
 ambari-utility/checkstyle.xml                   |    38 +
 ambari-utility/pom.xml                          |   145 +
 .../src/main/java/category/AlertTest.java       |    27 +
 .../main/java/category/AmbariUpgradeTest.java   |    27 +
 .../src/main/java/category/BlueprintTest.java   |    27 +
 .../src/main/java/category/FastTest.java        |    27 +
 .../src/main/java/category/KerberosTest.java    |    27 +
 .../src/main/java/category/MetricsTest.java     |    27 +
 .../src/main/java/category/SlowTest.java        |    27 +
 .../main/java/category/StackUpgradeTest.java    |    27 +
 .../apache/ambari/annotations/ApiIgnore.java    |    29 +
 ...AvoidTransactionalOnPrivateMethodsCheck.java |    55 +
 .../UndocumentedRestApiOperationCheck.java      |    76 +
 .../ambari/swagger/AmbariSwaggerReader.java     |   222 +
 .../src/main/resources/checkstyle_packages.xml  |    15 +
 ...dTransactionalOnPrivateMethodsCheckTest.java |    49 +
 .../UndocumentedRestApiOperationCheckTest.java  |    53 +
 .../ambari/swagger/AmbariSwaggerReaderTest.java |   182 +
 .../src/test/resources/log4j.properties         |    19 +
 .../checkstyle/InputRestApiOperation.java       |   138 +
 .../InputTransactionalOnPrivateMethods.java     |    46 +
 ambari-views/examples/weather-view/pom.xml      |     2 +-
 .../controllers/global/cluster_controller.js    |     2 +-
 .../global/user_settings_controller.js          |     3 +
 .../global/wizard_watcher_controller.js         |     6 +-
 ambari-web/app/controllers/installer.js         |     8 +-
 ambari-web/app/controllers/main/host/details.js |    83 +-
 ambari-web/app/controllers/main/service/item.js |     6 +-
 .../app/mappers/repository_version_mapper.js    |     2 +-
 ambari-web/app/messages.js                      |    36 +-
 .../mixins/common/configs/enhanced_configs.js   |     3 +-
 .../app/mixins/common/widgets/widget_mixin.js   |     3 +-
 ambari-web/app/styles/alerts.less               |    52 +-
 ambari-web/app/styles/application.less          |    91 +-
 ambari-web/app/styles/bootstrap_overrides.less  |    18 +-
 ambari-web/app/styles/dashboard.less            |     9 +-
 .../app/styles/enhanced_service_dashboard.less  |    79 +-
 .../templates/common/export_metrics_menu.hbs    |    16 +-
 .../templates/common/widget/gauge_widget.hbs    |    33 +-
 .../templates/common/widget/graph_widget.hbs    |    44 +-
 .../templates/common/widget/number_widget.hbs   |    33 +-
 .../templates/common/widget/template_widget.hbs |    35 +-
 .../main/dashboard/widgets/cluster_metrics.hbs  |    19 +-
 .../app/templates/main/service/info/summary.hbs |    91 +-
 .../main/service/info/summary/base.hbs          |    13 +-
 .../service/info/summary/client_components.hbs  |    10 +-
 .../service/info/summary/master_components.hbs  |    26 +-
 .../service/info/summary/slave_components.hbs   |    12 +-
 ambari-web/app/templates/main/service/item.hbs  |    40 +-
 .../templates/main/service/services/hbase.hbs   |   128 +-
 .../templates/main/service/services/hdfs.hbs    |   270 +-
 .../templates/main/service/services/hive.hbs    |    13 +-
 .../templates/main/service/services/ranger.hbs  |    59 +-
 .../templates/main/service/services/storm.hbs   |   118 +-
 .../templates/main/service/services/yarn.hbs    |   194 +-
 ambari-web/app/utils/ajax/ajax.js               |     2 +-
 .../app/views/common/quick_view_link_view.js    |    14 +-
 .../views/common/widget/gauge_widget_view.js    |    14 +-
 ambari-web/app/views/main/dashboard/widgets.js  |     2 +-
 .../app/views/main/service/info/summary.js      |    24 +
 ambari-web/app/views/main/service/service.js    |    13 +-
 .../app/views/main/service/services/hbase.js    |     2 +-
 .../app/views/main/service/services/hdfs.js     |    19 +-
 .../app/views/main/service/services/yarn.js     |     3 +-
 ambari-web/pom.xml                              |    65 +-
 .../global/wizard_watcher_controller_test.js    |     3 +-
 .../test/controllers/main/host/details_test.js  |    64 +-
 .../test/controllers/wizard/step8_test.js       |     4 +-
 .../test/mixins/common/widget_mixin_test.js     |     2 +
 .../common/widget/gauge_widget_view_test.js     |     2 +-
 .../test/views/main/dashboard/widgets_test.js   |     4 +-
 .../stacks/HDF/2.0/services/KAFKA/kerberos.json |     3 +
 .../stacks/ODPi/2.0/services/stack_advisor.py   |     2 +-
 .../addon/components/directory-viewer.js        |   324 +-
 .../hdfs-directory-viewer/addon/styles/app.css  |   190 +
 .../templates/components/directory-viewer.hbs   |   145 +
 .../addon/utils/viewer-config.js                |     4 +
 .../ui/hdfs-directory-viewer/bower.json         |     1 -
 .../resources/ui/hdfs-directory-viewer/index.js |     3 -
 .../ui/hdfs-directory-viewer/package.json       |     5 +-
 contrib/views/hawq/pom.xml                      |     2 +-
 contrib/views/hive-next/pom.xml                 |     4 +-
 .../hive2/resources/uploads/UploadService.java  |     4 +-
 contrib/views/hive20/pom.xml                    |     4 +-
 .../src/main/resources/ui/app/styles/app.scss   |     1 +
 contrib/views/pig/pom.xml                       |     2 +-
 contrib/views/pom.xml                           |     1 -
 contrib/views/slider/docs/index.md              |   164 -
 contrib/views/slider/gzip-content.cmd           |    17 -
 contrib/views/slider/gzip-content.ps1           |    81 -
 contrib/views/slider/pom.xml                    |   463 -
 .../apache/ambari/view/slider/AlertField.java   |    62 -
 .../apache/ambari/view/slider/AlertState.java   |    40 -
 .../ambari/view/slider/MetricsHolder.java       |    44 -
 .../apache/ambari/view/slider/SliderApp.java    |   198 -
 .../ambari/view/slider/SliderAppComponent.java  |    62 -
 .../ambari/view/slider/SliderAppType.java       |   107 -
 .../view/slider/SliderAppTypeComponent.java     |   103 -
 .../slider/SliderAppTypesResourceProvider.java  |    94 -
 .../ambari/view/slider/SliderAppsAlerts.java    |   127 -
 .../view/slider/SliderAppsConfiguration.java    |    52 -
 .../view/slider/SliderAppsResourceProvider.java |   124 -
 .../view/slider/SliderAppsViewController.java   |   112 -
 .../slider/SliderAppsViewControllerImpl.java    |  1510 -
 .../apache/ambari/view/slider/TemporalInfo.java |    48 -
 .../apache/ambari/view/slider/ViewStatus.java   |    72 -
 .../view/slider/clients/AmbariClient.java       |    58 -
 .../view/slider/clients/AmbariCluster.java      |    52 -
 .../view/slider/clients/AmbariClusterInfo.java  |    40 -
 .../slider/clients/AmbariHostComponent.java     |    49 -
 .../view/slider/clients/AmbariHostInfo.java     |    32 -
 .../view/slider/clients/AmbariService.java      |    36 -
 .../view/slider/clients/AmbariServiceInfo.java  |    51 -
 .../slider/rest/SliderAppTypesResource.java     |    54 -
 .../view/slider/rest/SliderAppsResource.java    |   163 -
 .../view/slider/rest/ViewStatusResource.java    |    40 -
 .../slider/rest/client/AmbariHttpClient.java    |   233 -
 .../view/slider/rest/client/BaseHttpClient.java |   157 -
 .../slider/rest/client/JMXMetricHolder.java     |    50 -
 .../ambari/view/slider/rest/client/Metric.java  |   158 -
 .../slider/rest/client/SliderAppJmxHelper.java  |   205 -
 .../rest/client/SliderAppMasterClient.java      |   324 -
 .../rest/client/SliderAppMetricsHelper.java     |   159 -
 .../view/slider/rest/client/TimelineMetric.java |   172 -
 .../slider/rest/client/TimelineMetrics.java     |   101 -
 .../rest/client/URLStreamProviderBasicAuth.java |   105 -
 .../slider/src/main/resources/slider.properties |    19 -
 .../slider/src/main/resources/ui/.gitignore     |    31 -
 .../views/slider/src/main/resources/ui/LICENSE  |    21 -
 .../slider/src/main/resources/ui/README.md      |   122 -
 .../src/main/resources/ui/app/assets/404.html   |   175 -
 .../app/assets/apple-touch-icon-precomposed.png |   Bin 1226 -> 0 bytes
 .../resources/ui/app/assets/crossdomain.xml     |    31 -
 .../resources/ui/app/assets/data/apps/apps.json |  1320 -
 .../ui/app/assets/data/apptypes/all_fields.json |   642 -
 .../ui/app/assets/data/metrics/metric.json      |   946 -
 .../ui/app/assets/data/metrics/metric2.json     |  3838 --
 .../ui/app/assets/data/metrics/metric3.json     |  1856 -
 .../ui/app/assets/data/metrics/metric4.json     |   968 -
 .../ui/app/assets/data/resource/empty_json.json |     1 -
 .../data/resource/slider-properties-2.json      |     9 -
 .../assets/data/resource/slider-properties.json |   148 -
 .../app/assets/data/resource/status_false.json  |     8 -
 .../app/assets/data/resource/status_true.json   |     5 -
 .../main/resources/ui/app/assets/favicon.ico    |   Bin 766 -> 0 bytes
 .../ui/app/assets/font/fontawesome-webfont.eot  |   Bin 37405 -> 0 bytes
 .../ui/app/assets/font/fontawesome-webfont.svg  |   399 -
 .../ui/app/assets/font/fontawesome-webfont.ttf  |   Bin 79076 -> 0 bytes
 .../ui/app/assets/font/fontawesome-webfont.woff |   Bin 43572 -> 0 bytes
 .../resources/ui/app/assets/images/.gitkeep     |     0
 .../ui-bg_flat_0_aaaaaa_40x100.png              |   Bin 180 -> 0 bytes
 .../ui-bg_glass_55_fbf9ee_1x400.png             |   Bin 120 -> 0 bytes
 .../ui-bg_glass_65_ffffff_1x400.png             |   Bin 105 -> 0 bytes
 .../ui-bg_glass_75_dadada_1x400.png             |   Bin 111 -> 0 bytes
 .../ui-bg_glass_75_e6e6e6_1x400.png             |   Bin 110 -> 0 bytes
 .../ui-bg_glass_75_ffffff_1x400.png             |   Bin 107 -> 0 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png    |   Bin 101 -> 0 bytes
 .../ui-bg_inset-soft_95_fef1ec_1x100.png        |   Bin 123 -> 0 bytes
 .../ui-icons_222222_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_2e83ff_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_454545_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_888888_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_cd0a0a_256x240.png                 |   Bin 4369 -> 0 bytes
 .../ui-icons_f6cf3b_256x240.png                 |   Bin 8884 -> 0 bytes
 .../src/main/resources/ui/app/assets/index.html |    46 -
 .../ui/app/assets/javascripts/ember-qunit.js    |   266 -
 .../ui/app/assets/javascripts/jquery.mockjax.js |   692 -
 .../assets/javascripts/modernizr-2.6.2.min.js   |     4 -
 .../ui/app/assets/javascripts/qunit.js          |  2495 -
 .../ui/app/assets/javascripts/sinon-1.13.0.js   |  5830 ---
 .../app/assets/javascripts/sinon-qunit-1.0.0.js |    62 -
 .../ui/app/assets/javascripts/tests.js          |    29 -
 .../ui/app/assets/stylesheets/qunit.css         |   237 -
 .../src/main/resources/ui/app/assets/tests.html |    46 -
 .../main/resources/ui/app/components/.gitkeep   |     0
 .../ui/app/components/configSection.js          |   164 -
 .../src/main/resources/ui/app/config/app.js     |    27 -
 .../src/main/resources/ui/app/config/env.js     |    33 -
 .../src/main/resources/ui/app/config/router.js  |    35 -
 .../src/main/resources/ui/app/config/store.js   |    23 -
 .../main/resources/ui/app/controllers/.gitkeep  |     0
 .../app/controllers/application_controller.js   |    27 -
 .../createAppWizard/step1_controller.js         |   251 -
 .../createAppWizard/step2_controller.js         |   136 -
 .../createAppWizard/step3_controller.js         |   250 -
 .../createAppWizard/step4_controller.js         |   176 -
 .../controllers/create_app_wizard_controller.js |   122 -
 .../slider_app/summary_controller.js            |    27 -
 .../ui/app/controllers/slider_app_controller.js |   472 -
 .../app/controllers/slider_apps_controller.js   |    35 -
 .../ui/app/controllers/slider_controller.js     |   138 -
 .../ui/app/controllers/tooltip_controller.js    |    19 -
 .../src/main/resources/ui/app/helpers/.gitkeep  |     0
 .../src/main/resources/ui/app/helpers/ajax.js   |   388 -
 .../src/main/resources/ui/app/helpers/helper.js |   169 -
 .../resources/ui/app/helpers/string_utils.js    |   163 -
 .../src/main/resources/ui/app/initialize.js     |   171 -
 .../ui/app/mappers/application_type.js          |   162 -
 .../src/main/resources/ui/app/mappers/mapper.js |    56 -
 .../ui/app/mappers/slider_apps_mapper.js        |   292 -
 .../ui/app/mixins/ajax_error_handler.js         |    82 -
 .../resources/ui/app/mixins/run_periodically.js |   109 -
 .../main/resources/ui/app/mixins/with_panels.js |    53 -
 .../src/main/resources/ui/app/models/.gitkeep   |     0
 .../resources/ui/app/models/config_property.js  |    47 -
 .../src/main/resources/ui/app/models/host.js    |    33 -
 .../main/resources/ui/app/models/slider_app.js  |   207 -
 .../resources/ui/app/models/slider_app_alert.js |   149 -
 .../ui/app/models/slider_app_component.js       |    65 -
 .../resources/ui/app/models/slider_app_type.js  |    64 -
 .../ui/app/models/slider_app_type_component.js  |    63 -
 .../resources/ui/app/models/slider_config.js    |    45 -
 .../ui/app/models/slider_quick_link.js          |    33 -
 .../resources/ui/app/models/typed_property.js   |    38 -
 .../ui/app/routes/create_app_wizard.js          |    54 -
 .../src/main/resources/ui/app/routes/main.js    |    75 -
 .../src/main/resources/ui/app/styles/app.less   |   303 -
 .../resources/ui/app/styles/application.less    |    23 -
 .../resources/ui/app/styles/application.styl    |    18 -
 .../resources/ui/app/styles/apps-table.less     |   320 -
 .../main/resources/ui/app/styles/common.less    |   109 -
 .../resources/ui/app/styles/old-bootstrap.less  |   164 -
 .../main/resources/ui/app/styles/wizard.less    |   232 -
 .../resources/ui/app/templates/application.hbs  |    56 -
 .../ui/app/templates/common/ajax_error.hbs      |    24 -
 .../ui/app/templates/common/app_tooltip.hbs     |    24 -
 .../resources/ui/app/templates/common/chart.hbs |    26 -
 .../ui/app/templates/common/config.hbs          |    37 -
 .../ui/app/templates/components/.gitkeep        |     0
 .../app/templates/components/configSection.hbs  |    78 -
 .../ui/app/templates/createAppWizard.hbs        |    43 -
 .../ui/app/templates/createAppWizard/step1.hbs  |   192 -
 .../ui/app/templates/createAppWizard/step2.hbs  |    62 -
 .../ui/app/templates/createAppWizard/step3.hbs  |    37 -
 .../ui/app/templates/createAppWizard/step4.hbs  |    41 -
 .../main/resources/ui/app/templates/index.hbs   |    21 -
 .../resources/ui/app/templates/slider_app.hbs   |    70 -
 .../ui/app/templates/slider_app/configs.hbs     |    40 -
 .../slider_app/destroy/destroy_popup.hbs        |    20 -
 .../slider_app/destroy/destroy_popup_footer.hbs |    28 -
 .../ui/app/templates/slider_app/flex_popup.hbs  |    40 -
 .../ui/app/templates/slider_app/summary.hbs     |   135 -
 .../resources/ui/app/templates/slider_apps.hbs  |    87 -
 .../ui/app/templates/slider_title_tooltip.hbs   |    27 -
 .../ui/app/templates/unavailable_apps.hbs       |    22 -
 .../src/main/resources/ui/app/translations.js   |   169 -
 .../src/main/resources/ui/app/views/.gitkeep    |     0
 .../resources/ui/app/views/application_view.js  |    70 -
 .../resources/ui/app/views/common/chart_view.js |   914 -
 .../ui/app/views/common/config_set_view.js      |    57 -
 .../ui/app/views/common/filter_view.js          |   370 -
 .../resources/ui/app/views/common/sort_view.js  |   206 -
 .../resources/ui/app/views/common/table_view.js |   418 -
 .../ui/app/views/createAppWizard/step1_view.js  |    47 -
 .../ui/app/views/createAppWizard/step2_view.js  |    33 -
 .../ui/app/views/createAppWizard/step3_view.js  |    25 -
 .../ui/app/views/createAppWizard/step4_view.js  |    24 -
 .../ui/app/views/create_app_wizard_view.js      |    80 -
 .../ui/app/views/slider_app/configs_view.js     |    57 -
 .../slider_app/destroy_modal_footer_view.js     |    41 -
 .../app/views/slider_app/destroy_popup_view.js  |    37 -
 .../views/slider_app/metrics/app_metric_view.js |    77 -
 .../views/slider_app/metrics/metric2_view.js    |    63 -
 .../views/slider_app/metrics/metric3_view.js    |    61 -
 .../views/slider_app/metrics/metric4_view.js    |    54 -
 .../app/views/slider_app/metrics/metric_view.js |    70 -
 .../ui/app/views/slider_app/summary_view.js     |   141 -
 .../resources/ui/app/views/slider_app_view.js   |    30 -
 .../resources/ui/app/views/slider_apps_view.js  |   175 -
 .../slider/src/main/resources/ui/config.js      |   123 -
 .../main/resources/ui/envs/development/env.js   |    21 -
 .../main/resources/ui/envs/production/env.js    |    21 -
 .../arraycontroller/arraycontroller.js.hbs      |    23 -
 .../generators/arraycontroller/generator.json   |    10 -
 .../ui/generators/component/component.hbs.hbs   |    19 -
 .../ui/generators/component/component.js.hbs    |    23 -
 .../ui/generators/component/generator.json      |    14 -
 .../ui/generators/controller/controller.js.hbs  |    23 -
 .../ui/generators/controller/generator.json     |    10 -
 .../ui/generators/helper/generator.json         |    10 -
 .../ui/generators/helper/helper.js.hbs          |    24 -
 .../ui/generators/model/generator.json          |    10 -
 .../resources/ui/generators/model/model.js.hbs  |    24 -
 .../ui/generators/route/generator.json          |    10 -
 .../resources/ui/generators/route/route.js.hbs  |    25 -
 .../ui/generators/template/generator.json       |    10 -
 .../ui/generators/template/template.hbs.hbs     |    19 -
 .../resources/ui/generators/view/generator.json |    10 -
 .../resources/ui/generators/view/view.js.hbs    |    23 -
 .../slider/src/main/resources/ui/karma.conf.js  |    94 -
 .../slider/src/main/resources/ui/package.json   |    37 -
 .../slider/src/main/resources/ui/runner.js      |   136 -
 .../views/slider/src/main/resources/ui/setup.js |    78 -
 .../slider/src/main/resources/ui/test/index.md  |    28 -
 .../ui/test/integration/pages/index_test.js     |   127 -
 .../integration/pages/slider_errors_test.js     |    63 -
 .../processes/create_new_app_test.js            |   358 -
 .../createAppWizard/step1_controller_test.js    |   431 -
 .../createAppWizard/step2_controller_test.js    |   403 -
 .../createAppWizard/step3_controller_test.js    |   421 -
 .../createAppWizard/step4_controller_test.js    |   440 -
 .../create_app_wizard_controller_test.js        |   201 -
 .../slider_app/summary_controller_test.js       |    36 -
 .../controllers/slider_app_controller_test.js   |   607 -
 .../controllers/slider_apps_controller_test.js  |    58 -
 .../unit/controllers/slider_controller_test.js  |   140 -
 .../unit/mappers/slider_apps_mapper_test.js     |    85 -
 .../unit/models/slider_app_component_test.js    |    51 -
 .../ui/test/unit/models/slider_app_test.js      |    95 -
 .../test/unit/views/common/table_view_test.js   |    35 -
 .../unit/views/slider_app/summary_view_test.js  |    68 -
 .../ui/vendor/scripts/common/bootstrap.js       |  1951 -
 .../ui/vendor/scripts/common/bs-basic.min.js    |     1 -
 .../ui/vendor/scripts/common/bs-button.min.js   |     1 -
 .../ui/vendor/scripts/common/bs-core.min.js     |     1 -
 .../ui/vendor/scripts/common/bs-modal.min.js    |     1 -
 .../ui/vendor/scripts/common/bs-nav.min.js      |     1 -
 .../ui/vendor/scripts/common/bs-popover.min.js  |     1 -
 .../vendor/scripts/common/console-polyfill.js   |    13 -
 .../ui/vendor/scripts/common/cubism.v1.js       |  1085 -
 .../resources/ui/vendor/scripts/common/d3.v2.js |  7033 ---
 .../vendor/scripts/common/ember-i18n-1.4.1.js   |   199 -
 .../ui/vendor/scripts/common/handlebars.js      |  2746 --
 .../ui/vendor/scripts/common/jquery.js          |  8829 ----
 .../ui/vendor/scripts/common/jquery.timeago.js  |   214 -
 .../ui/vendor/scripts/common/jquery.ui.core.js  |   334 -
 .../ui/vendor/scripts/common/jquery.ui.mouse.js |   175 -
 .../vendor/scripts/common/jquery.ui.sortable.js |  1088 -
 .../vendor/scripts/common/jquery.ui.widget.js   |   276 -
 .../ui/vendor/scripts/common/moment.min.js      |     7 -
 .../ui/vendor/scripts/common/rickshaw.js        |  2659 -
 .../resources/ui/vendor/scripts/common/tv4.js   |  1605 -
 .../ui/vendor/scripts/development/ember-data.js | 10620 ----
 .../ui/vendor/scripts/development/ember.js      | 43235 -----------------
 .../ui/vendor/scripts/production/ember-data.js  | 10626 ----
 .../ui/vendor/scripts/production/ember.js       | 41620 ----------------
 .../resources/ui/vendor/styles/bootstrap.css    |  5785 ---
 .../main/resources/ui/vendor/styles/cubism.css  |    82 -
 .../ui/vendor/styles/font-awesome-ie7.css       |  1203 -
 .../resources/ui/vendor/styles/font-awesome.css |  1479 -
 .../jquery-ui-1.8.16.custom.css                 |  1320 -
 .../resources/ui/vendor/styles/rickshaw.css     |   307 -
 .../src/main/resources/view.log4j.properties    |    27 -
 .../views/slider/src/main/resources/view.xml    |    82 -
 .../ambari/view/slider/SliderClientTest.java    |    31 -
 .../rest/client/SliderAppMasterClientTest.java  |   177 -
 contrib/views/tez/pom.xml                       |     3 +-
 contrib/views/wfmanager/pom.xml                 |     1 +
 .../ui/app/components/flow-designer.js          |    27 +
 .../resources/ui/app/components/hdfs-browser.js |     8 +-
 .../ui/app/domain/actionjob_hanlder.js          |     3 +
 .../ui/app/domain/workflow-xml-generator.js     |     3 +
 .../ui/app/services/workspace-manager.js        |     5 +
 .../src/main/resources/ui/app/styles/app.less   |     5 +-
 .../app/templates/components/flow-designer.hbs  |     9 +-
 .../app/templates/components/hdfs-browser.hbs   |    16 +-
 .../app/templates/components/spark-action.hbs   |     7 +-
 .../main/resources/ui/app/utils/constants.js    |     3 +-
 .../main/resources/ui/app/utils/hdfsviewer.js   |     3 +
 .../wfmanager/src/main/resources/ui/bower.json  |     5 +-
 .../addon/components/directory-viewer.js        |   325 +-
 .../hdfs-directory-viewer/addon/styles/app.css  |   190 +
 .../templates/components/directory-viewer.hbs   |   146 +
 .../addon/utils/viewer-config.js                |     3 +
 .../hdfs-directory-viewer/bower.json            |     1 -
 .../hdfs-directory-viewer/index.js              |     3 -
 .../hdfs-directory-viewer/package.json          |     5 +-
 .../src/main/resources/ui/package.json          |     3 +-
 .../wfmanager/src/main/resources/ui/yarn.lock   |    68 +-
 docs/pom.xml                                    |    36 +
 pom.xml                                         |    19 +-
 utility/checkstyle.xml                          |    38 -
 utility/pom.xml                                 |   125 -
 utility/src/main/java/category/AlertTest.java   |    27 -
 .../main/java/category/AmbariUpgradeTest.java   |    27 -
 .../src/main/java/category/BlueprintTest.java   |    27 -
 utility/src/main/java/category/FastTest.java    |    27 -
 .../src/main/java/category/KerberosTest.java    |    27 -
 utility/src/main/java/category/MetricsTest.java |    27 -
 utility/src/main/java/category/SlowTest.java    |    27 -
 .../main/java/category/StackUpgradeTest.java    |    27 -
 .../apache/ambari/annotations/ApiIgnore.java    |    29 -
 ...AvoidTransactionalOnPrivateMethodsCheck.java |    55 -
 .../UndocumentedRestApiOperationCheck.java      |    76 -
 .../src/main/resources/checkstyle_packages.xml  |    15 -
 ...dTransactionalOnPrivateMethodsCheckTest.java |    49 -
 .../UndocumentedRestApiOperationCheckTest.java  |    53 -
 .../checkstyle/InputRestApiOperation.java       |   138 -
 .../InputTransactionalOnPrivateMethods.java     |    46 -
 1039 files changed, 27140 insertions(+), 239208 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/406abf48/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/406abf48/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 269bc19,22858dd..2c02f70
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@@ -176,13 -175,8 +176,13 @@@ public class UpgradeResourceProvider ex
    public static final String UPGRADE_HOST_ORDERED_HOSTS = "Upgrade/host_order";
  
    /**
 +   * Allows reversion of a successful upgrade of a patch.
 +   */
 +  public static final String UPGRADE_REVERT_UPGRADE_ID = "Upgrade/revert_upgrade_id";
 +
 +  /**
     * The role that will be used when creating HRC's for the type
-    * {@link StageWrapper.Type#RU_TASKS}.
+    * {@link StageWrapper.Type#UPGRADE_TASKS}.
     */
    protected static final String EXECUTE_TASK_ROLE = "ru_execute_tasks";
  

http://git-wip-us.apache.org/repos/asf/ambari/blob/406abf48/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/406abf48/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/406abf48/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/406abf48/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
----------------------------------------------------------------------


Mime
View raw message