You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/06/12 17:19:26 UTC
[09/10] 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/382da979
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/382da979
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/382da979
Branch: refs/heads/trunk
Commit: 382da97990dfe673bb6d4d69590444ddbbb455eb
Parents: 871f85b 8d129d4
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Jun 12 12:44:40 2017 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Jun 12 12:44:40 2017 -0400
----------------------------------------------------------------------
.../org/apache/ambari/tools/zk/ZkMigrator.java | 44 +-
.../apache/ambari/tools/zk/ZkMigratorTest.java | 60 +-
.../main/python/ambari_commons/inet_utils.py | 32 ++
.../src/main/python/ambari_commons/os_check.py | 6 +
.../ambari_commons/resources/os_family.json | 10 +
.../core/providers/__init__.py | 19 +-
.../core/resources/zkmigrator.py | 17 +-
.../libraries/providers/__init__.py | 3 -
.../InfraKerberosHostValidator.java | 54 --
.../InfraRuleBasedAuthorizationPlugin.java | 542 -------------------
.../InfraUserRolesLookupStrategy.java | 49 --
.../security/InfraKerberosHostValidator.java | 54 ++
.../InfraRuleBasedAuthorizationPlugin.java | 542 +++++++++++++++++++
.../security/InfraUserRolesLookupStrategy.java | 49 ++
ambari-logsearch/docker/Dockerfile | 6 +-
ambari-metrics/ambari-metrics-common/pom.xml | 5 +
.../timeline/AbstractTimelineMetricsSink.java | 64 ++-
.../sink/timeline/AppCookieManager.java | 219 ++++++++
.../sink/timeline/AppCookieManagerTest.java | 52 ++
.../ambari-metrics-host-aggregator/pom.xml | 30 +-
.../AbstractMetricPublisherThread.java | 134 -----
.../aggregator/AggregatedMetricsPublisher.java | 101 ----
.../host/aggregator/AggregatorApplication.java | 98 ++--
.../host/aggregator/AggregatorWebService.java | 2 +-
.../host/aggregator/RawMetricsPublisher.java | 60 --
.../host/aggregator/TimelineMetricsHolder.java | 26 +-
.../sink/timeline/AbstractMetricPublisher.java | 169 ++++++
.../timeline/AggregatedMetricsPublisher.java | 103 ++++
.../sink/timeline/RawMetricsPublisher.java | 65 +++
.../aggregator/AggregatorApplicationTest.java | 55 ++
.../aggregator/AggregatorWebServiceTest.java | 135 +++++
.../aggregator/TimelineMetricsHolderTest.java | 107 ++++
.../timeline/AbstractMetricPublisherTest.java | 82 +++
.../AggregatedMetricsPublisherTest.java | 154 ++++++
.../sink/timeline/RawMetricsPublisherTest.java | 151 ++++++
.../src/main/python/core/aggregator.py | 6 +-
.../src/main/python/core/controller.py | 2 +-
ambari-project/pom.xml | 5 +
.../security/kerberos/kerberos_descriptor.md | 5 +-
ambari-server/pom.xml | 24 +-
.../server/KdcServerConnectionVerification.java | 2 +-
.../ambari/server/StateRecoveryManager.java | 2 +-
.../actionmanager/ActionDBAccessorImpl.java | 6 +-
.../server/actionmanager/ActionManager.java | 8 +-
.../server/actionmanager/ActionScheduler.java | 18 +-
.../ambari/server/actionmanager/Stage.java | 6 +-
.../apache/ambari/server/agent/ActionQueue.java | 2 +-
.../ambari/server/agent/AgentRequests.java | 10 +-
.../ambari/server/agent/ExecutionCommand.java | 6 +-
.../ambari/server/agent/HeartBeatHandler.java | 17 +-
.../ambari/server/agent/HeartbeatMonitor.java | 14 +-
.../ambari/server/agent/HeartbeatProcessor.java | 4 +-
.../apache/ambari/server/agent/HostInfo.java | 2 +-
.../apache/ambari/server/agent/Register.java | 2 +-
.../ambari/server/agent/rest/AgentResource.java | 18 +-
.../ambari/server/api/query/QueryImpl.java | 4 +-
.../server/api/rest/BootStrapResource.java | 6 +-
.../server/api/services/AmbariMetaInfo.java | 12 +-
.../ambari/server/api/services/BaseRequest.java | 2 +-
.../api/services/PersistKeyValueService.java | 16 +-
.../services/parsers/JsonRequestBodyParser.java | 2 +-
.../StackAdvisorBlueprintProcessor.java | 2 +-
.../commands/StackAdvisorCommand.java | 10 +-
.../views/ViewDataMigrationService.java | 6 +-
.../server/bootstrap/BSHostStatusCollector.java | 12 +-
.../ambari/server/bootstrap/BSRunner.java | 14 +-
.../ambari/server/bootstrap/BootStrapImpl.java | 6 +-
.../server/checks/AbstractCheckDescriptor.java | 7 -
.../checks/ServiceCheckValidityCheck.java | 9 +-
.../server/checks/UpgradeCheckRegistry.java | 4 +-
.../server/configuration/Configuration.java | 17 +
.../controller/AmbariActionExecutionHelper.java | 9 +-
.../AmbariCustomCommandExecutionHelper.java | 17 +-
.../server/controller/AmbariHandlerList.java | 2 +-
.../AmbariManagementControllerImpl.java | 96 ++--
.../ambari/server/controller/AmbariServer.java | 2 +-
.../server/controller/ControllerModule.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 21 +-
.../internal/AbstractPropertyProvider.java | 4 +-
.../internal/AbstractProviderModule.java | 15 +-
.../internal/ActionResourceProvider.java | 3 +-
.../controller/internal/AppCookieManager.java | 8 +-
.../controller/internal/BaseProvider.java | 10 +-
.../BlueprintConfigurationProcessor.java | 28 +-
.../internal/ClientConfigResourceProvider.java | 2 +-
.../internal/ClusterControllerImpl.java | 4 +-
.../internal/ClusterResourceProvider.java | 6 +-
...atibleRepositoryVersionResourceProvider.java | 2 +-
.../internal/ComponentResourceProvider.java | 6 +-
.../internal/ConfigGroupResourceProvider.java | 15 +-
.../internal/GroupResourceProvider.java | 4 +-
.../internal/HostComponentResourceProvider.java | 2 +-
.../internal/HostResourceProvider.java | 12 +-
.../controller/internal/HostStatusHelper.java | 2 +-
.../internal/JobResourceProvider.java | 12 +-
.../internal/MemberResourceProvider.java | 4 +-
.../PreUpgradeCheckResourceProvider.java | 8 +-
.../internal/RequestResourceProvider.java | 6 +-
.../internal/RequestStageContainer.java | 2 +-
.../internal/ServiceResourceProvider.java | 53 +-
.../internal/TaskAttemptResourceProvider.java | 6 +-
.../controller/internal/URLStreamProvider.java | 10 +-
.../internal/UpgradeResourceProvider.java | 5 -
.../internal/UserResourceProvider.java | 4 +-
.../internal/WidgetLayoutResourceProvider.java | 4 +-
.../internal/WorkflowResourceProvider.java | 6 +-
.../server/controller/jmx/JMXMetricHolder.java | 2 +-
.../logging/LogSearchDataRetrievalService.java | 4 +-
.../logging/LoggingRequestHelperImpl.java | 15 +-
.../logging/LoggingSearchPropertyProvider.java | 4 +-
.../metrics/MetricsCollectorHAManager.java | 2 +-
.../metrics/MetricsDownsamplingMethod.java | 5 +-
.../metrics/timeline/AMSPropertyProvider.java | 2 +-
.../metrics/timeline/MetricsRequestHelper.java | 20 +-
.../timeline/cache/TimelineMetricCache.java | 28 +-
.../cache/TimelineMetricCacheEntryFactory.java | 46 +-
.../cache/TimelineMetricsCacheSizeOfEngine.java | 6 +-
.../controller/utilities/KerberosChecker.java | 2 +-
.../ServiceCalculatedStateFactory.java | 2 +-
.../server/credentialapi/CredentialUtil.java | 2 +-
.../customactions/ActionDefinitionManager.java | 6 +-
.../alerts/AlertHashInvalidationListener.java | 2 +-
.../alerts/AlertLifecycleListener.java | 2 +-
.../alerts/AlertMaintenanceModeListener.java | 2 +-
.../AlertServiceComponentHostListener.java | 2 +-
.../alerts/AlertServiceStateListener.java | 2 +-
.../alerts/AlertStateChangedListener.java | 2 +-
.../upgrade/HostVersionOutOfSyncListener.java | 2 -
.../CachedRoleCommandOrderProvider.java | 2 +-
.../server/metadata/RoleCommandOrder.java | 7 +-
.../system/impl/AmbariPerformanceMonitor.java | 4 +-
.../system/impl/DatabaseMetricsSource.java | 2 +-
.../metrics/system/impl/JvmMetricsSource.java | 2 +-
.../system/impl/MetricsConfiguration.java | 2 +-
.../metrics/system/impl/MetricsServiceImpl.java | 2 +-
.../dispatchers/AlertScriptDispatcher.java | 45 +-
.../ambari/server/orm/DBAccessorImpl.java | 2 +-
.../server/orm/dao/AlertDefinitionDAO.java | 2 +-
.../ambari/server/orm/dao/HostVersionDAO.java | 6 +-
.../ambari/server/orm/dao/ServiceConfigDAO.java | 1 -
.../orm/entities/RepositoryVersionEntity.java | 2 +-
.../orm/helpers/dbms/GenericDbmsHelper.java | 4 +-
.../server/resources/ResourceManager.java | 11 +-
.../server/resources/api/rest/GetResource.java | 9 +-
.../scheduler/AbstractLinearExecutionJob.java | 6 +-
.../scheduler/ExecutionScheduleManager.java | 12 +-
.../scheduler/ExecutionSchedulerImpl.java | 4 +-
.../server/security/CertificateManager.java | 6 +-
.../ambari/server/security/SecurityFilter.java | 12 +-
.../AmbariLdapBindAuthenticator.java | 2 +-
.../AmbariPamAuthenticationProvider.java | 2 +-
.../jwt/JwtAuthenticationFilter.java | 2 +-
.../encryption/MasterKeyServiceImpl.java | 8 +-
.../unsecured/rest/CertificateDownload.java | 6 +-
.../unsecured/rest/CertificateSign.java | 6 +-
.../security/unsecured/rest/ConnectionInfo.java | 6 +-
.../kerberos/ADKerberosOperationHandler.java | 6 +-
.../kerberos/CreateKeytabFilesServerAction.java | 6 +-
.../kerberos/DestroyPrincipalsServerAction.java | 2 +-
.../kerberos/IPAKerberosOperationHandler.java | 18 +-
.../kerberos/MITKerberosOperationHandler.java | 2 +-
.../serveraction/upgrades/ConfigureAction.java | 2 +-
.../upgrades/FinalizeUpgradeAction.java | 4 +-
.../upgrades/UpdateDesiredStackAction.java | 2 +-
.../ambari/server/stack/ExtensionDirectory.java | 2 +-
.../ambari/server/stack/ExtensionModule.java | 4 +-
.../ambari/server/stack/MasterHostResolver.java | 2 +-
.../ambari/server/stack/ServiceDirectory.java | 2 +-
.../ambari/server/stack/ServiceModule.java | 4 +-
.../ambari/server/stack/StackDirectory.java | 7 +-
.../ambari/server/stack/StackManager.java | 9 +-
.../apache/ambari/server/stack/StackModule.java | 20 +-
.../ambari/server/stageplanner/RoleGraph.java | 51 +-
.../apache/ambari/server/state/CheckHelper.java | 39 +-
.../org/apache/ambari/server/state/Cluster.java | 6 +-
.../ambari/server/state/ConfigFactory.java | 8 -
.../server/state/ServiceComponentImpl.java | 21 +-
.../apache/ambari/server/state/ServiceImpl.java | 21 +-
.../apache/ambari/server/state/StackInfo.java | 2 +-
.../ambari/server/state/UpgradeContext.java | 2 -
.../ambari/server/state/action/ActionImpl.java | 23 +-
.../ambari/server/state/alert/AlertUri.java | 2 +-
.../server/state/cluster/ClusterImpl.java | 45 +-
.../server/state/cluster/ClustersImpl.java | 6 +-
.../ambari/server/state/host/HostImpl.java | 32 +-
.../state/kerberos/KerberosDescriptor.java | 51 ++
.../kerberos/VariableReplacementHelper.java | 23 +-
.../server/state/stack/ConfigUpgradePack.java | 2 +-
.../ambari/server/state/stack/OsFamily.java | 12 +
.../state/stack/StackRoleCommandOrder.java | 2 +-
.../ambari/server/state/stack/UpgradePack.java | 2 +-
.../state/stack/upgrade/ColocatedGrouping.java | 2 +-
.../upgrade/ConfigUpgradeChangeDefinition.java | 2 +-
.../state/stack/upgrade/ConfigureTask.java | 2 +-
.../state/stack/upgrade/HostOrderGrouping.java | 2 +-
.../stack/upgrade/RepositoryVersionHelper.java | 4 +-
.../state/stack/upgrade/RestartGrouping.java | 2 +-
.../stack/upgrade/ServiceCheckGrouping.java | 2 +-
.../state/stack/upgrade/StartGrouping.java | 2 +-
.../state/stack/upgrade/StopGrouping.java | 2 +-
.../state/stack/upgrade/TaskWrapperBuilder.java | 2 +-
.../svccomphost/ServiceComponentHostImpl.java | 23 +-
.../server/topology/BlueprintValidatorImpl.java | 2 +-
.../topology/tasks/ConfigureClusterTask.java | 2 +-
.../server/topology/tasks/TopologyHostTask.java | 4 +-
.../validators/ClusterConfigTypeValidator.java | 2 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 2 +-
.../server/upgrade/SchemaUpgradeHelper.java | 2 +-
.../server/upgrade/UpgradeCatalog222.java | 2 +-
.../server/upgrade/UpgradeCatalog250.java | 39 +-
.../apache/ambari/server/utils/AmbariPath.java | 2 +-
.../ambari/server/utils/CommandUtils.java | 2 +-
.../ambari/server/utils/SecretReference.java | 2 +-
.../ambari/server/utils/ShellCommandUtil.java | 6 +-
.../apache/ambari/server/utils/StageUtils.java | 6 +-
.../server/view/HttpImpersonatorImpl.java | 2 +-
.../server/view/ViewAmbariStreamProvider.java | 2 +-
.../ambari/server/view/ViewContextImpl.java | 6 +-
.../view/ViewDataMigrationContextImpl.java | 6 +-
.../server/view/ViewDataMigrationUtility.java | 4 +-
.../server/view/ViewDirectoryWatcher.java | 6 +-
.../ambari/server/view/ViewExtractor.java | 8 +-
.../apache/ambari/server/view/ViewRegistry.java | 27 +-
.../server/view/ViewURLStreamProvider.java | 14 +-
.../main/python/ambari_server/setupMpacks.py | 4 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 12 +-
.../0.1.0/configuration/ams-hbase-env.xml | 4 +-
.../package/templates/hbase_master_jaas.conf.j2 | 10 +
.../templates/hbase_regionserver_jaas.conf.j2 | 10 +
.../DRUID/0.9.2/configuration/druid-env.xml | 2 +-
.../DRUID/0.9.2/package/scripts/druid.py | 7 +
.../DRUID/0.9.2/package/scripts/params.py | 1 +
.../package/templates/hbase_master_jaas.conf.j2 | 10 +
.../templates/hbase_regionserver_jaas.conf.j2 | 10 +
.../HBASE/2.0.0.3.0/configuration/hbase-env.xml | 4 +-
.../package/templates/hbase_master_jaas.conf.j2 | 10 +
.../templates/hbase_regionserver_jaas.conf.j2 | 10 +
.../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 17 +
.../package/templates/hdfs_dn_jaas.conf.j2 | 27 +
.../package/templates/hdfs_jn_jaas.conf.j2 | 27 +
.../package/templates/hdfs_nn_jaas.conf.j2 | 27 +
.../HDFS/3.0.0.3.0/package/scripts/hdfs.py | 17 +
.../package/templates/hdfs_dn_jaas.conf.j2 | 27 +
.../package/templates/hdfs_jn_jaas.conf.j2 | 27 +
.../package/templates/hdfs_nn_jaas.conf.j2 | 27 +
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 2 +-
.../KAFKA/0.8.1/configuration/kafka-env.xml | 4 +
.../0.8.1/configuration/kafka_jaas_conf.xml | 11 +
.../0.8.1/package/templates/kafka_jaas.conf.j2 | 11 +
.../package/templates/krb5JAASLogin.conf.j2 | 9 +-
.../package/templates/krb5JAASLogin.conf.j2 | 9 +-
.../0.9.1/package/scripts/storm_yaml_utils.py | 5 +-
.../0.9.1/package/templates/storm_jaas.conf.j2 | 10 +
.../2.1.0.2.0/package/scripts/params_linux.py | 32 +-
.../package/scripts/resourcemanager.py | 2 +-
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 17 +
.../package/templates/mapred_jaas.conf.j2 | 28 +
.../package/templates/yarn_ats_jaas.conf.j2 | 27 +
.../package/templates/yarn_jaas.conf.j2 | 12 +-
.../package/templates/yarn_nm_jaas.conf.j2 | 27 +
.../configuration-mapred/mapred-env.xml | 4 +-
.../YARN/3.0.0.3.0/configuration/yarn-env.xml | 15 +-
.../YARN/3.0.0.3.0/kerberos.json | 4 +-
.../3.0.0.3.0/package/scripts/params_linux.py | 32 +-
.../package/scripts/resourcemanager.py | 2 +-
.../YARN/3.0.0.3.0/package/scripts/yarn.py | 19 +-
.../package/templates/mapred_jaas.conf.j2 | 28 +
.../package/templates/yarn_ats_jaas.conf.j2 | 27 +
.../package/templates/yarn_jaas.conf.j2 | 12 +-
.../package/templates/yarn_nm_jaas.conf.j2 | 27 +
.../YARN/3.0.0.3.0/service_advisor.py | 4 +-
.../0.6.0.2.5/package/scripts/master.py | 4 +-
.../resources/host_scripts/alert_disk_space.py | 22 +-
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../YARN/configuration-mapred/mapred-env.xml | 4 +-
.../services/HBASE/configuration/hbase-env.xml | 4 +-
.../services/HDFS/configuration/hadoop-env.xml | 7 +
.../services/YARN/configuration/yarn-env.xml | 16 +-
.../services/HDFS/configuration/hadoop-env.xml | 7 +
.../resources/stacks/HDP/2.6/repos/repoinfo.xml | 14 +
.../services/SPARK2/configuration/livy2-env.xml | 4 +-
.../stacks/HDP/2.6/services/YARN/kerberos.json | 4 +-
.../services/HDFS/configuration/hadoop-env.xml | 7 +
.../YARN/configuration-mapred/mapred-env.xml | 4 +-
.../src/main/resources/stacks/stack_advisor.py | 115 +++-
.../ambari/server/agent/AgentResourceTest.java | 6 +-
.../server/agent/LocalAgentSimulator.java | 6 +-
.../ambari/server/agent/TestActionQueue.java | 2 +-
.../server/agent/TestHeartbeatHandler.java | 4 +-
.../server/api/services/AmbariMetaInfoTest.java | 4 +-
.../server/api/services/PersistServiceTest.java | 6 +-
.../server/bootstrap/BootStrapResourceTest.java | 6 +-
.../ambari/server/bootstrap/BootStrapTest.java | 6 +-
.../checks/ServiceCheckValidityCheckTest.java | 42 +-
.../AmbariManagementControllerImplTest.java | 13 +-
.../AmbariManagementControllerTest.java | 17 +-
.../server/controller/KerberosHelperTest.java | 129 ++---
.../AbstractJDBCResourceProviderTest.java | 2 +-
.../BlueprintConfigurationProcessorTest.java | 3 +
.../CredentialResourceProviderTest.java | 10 +-
.../PreUpgradeCheckResourceProviderTest.java | 15 +-
.../StackUpgradeConfigurationMergeTest.java | 3 +-
.../internal/UpgradeResourceProviderTest.java | 2 +-
.../metrics/ganglia/GangliaMetricTest.java | 2 +-
.../dispatchers/AlertScriptDispatcherTest.java | 67 +++
.../apache/ambari/server/orm/OrmTestHelper.java | 4 +-
.../orm/dao/RepositoryVersionDAOTest.java | 2 +-
.../sample/checks/SampleServiceCheck.java | 4 -
.../server/security/CertGenerationTest.java | 6 +-
.../server/security/SslExecutionTest.java | 6 +-
.../encryption/MasterKeyServiceTest.java | 6 +-
.../upgrades/ConfigureActionTest.java | 5 -
.../upgrades/UpgradeActionTest.java | 5 -
.../server/stageplanner/TestStagePlanner.java | 197 ++++++-
.../ambari/server/state/CheckHelperTest.java | 36 +-
.../server/state/cluster/ClusterTest.java | 4 +-
.../ambari/server/state/host/HostTest.java | 6 +-
.../state/kerberos/KerberosDescriptorTest.java | 9 +
.../kerberos/VariableReplacementHelperTest.java | 130 +++--
.../svccomphost/ServiceComponentHostTest.java | 5 +-
.../server/testing/DBInconsistencyTests.java | 2 +-
.../server/upgrade/UpgradeCatalogHelper.java | 7 -
.../ambari/server/upgrade/UpgradeTest.java | 2 +-
.../python/host_scripts/TestAlertDiskSpace.py | 12 +-
.../python/stacks/2.0.6/HDFS/test_datanode.py | 10 +
.../stacks/2.0.6/HDFS/test_journalnode.py | 11 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 24 +-
.../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 10 +
.../python/stacks/2.0.6/HDFS/test_snamenode.py | 12 +-
.../test/python/stacks/2.0.6/HDFS/test_zkfc.py | 17 +-
.../stacks/2.0.6/YARN/test_historyserver.py | 10 +
.../stacks/2.0.6/YARN/test_mapreduce2_client.py | 10 +
.../stacks/2.0.6/YARN/test_nodemanager.py | 10 +
.../stacks/2.0.6/YARN/test_resourcemanager.py | 10 +
.../stacks/2.0.6/YARN/test_yarn_client.py | 10 +
.../stacks/2.0.6/common/test_stack_advisor.py | 153 ++++++
.../test/python/stacks/2.6/DRUID/test_druid.py | 23 +-
.../test/python/stacks/2.6/configs/default.json | 3 +-
.../stacks/HDP/2.0.6.1/role_command_order.json | 101 +---
ambari-web/app/config.js | 9 +-
.../progress_popup_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller.js | 2 +-
.../manage_alert_notifications_controller.js | 35 +-
ambari-web/app/messages.js | 9 +-
ambari-web/app/routes/add_service_routes.js | 2 +-
ambari-web/app/routes/main.js | 2 +-
ambari-web/app/styles/application.less | 11 +
ambari-web/app/styles/bootstrap_overrides.less | 49 ++
ambari-web/app/styles/dashboard.less | 115 ++--
.../templates/common/export_metrics_menu.hbs | 16 +-
ambari-web/app/templates/common/progress.hbs | 4 +
ambari-web/app/templates/main.hbs | 2 +-
.../app/templates/main/admin/kerberos.hbs | 34 +-
.../main/alerts/create_alert_notification.hbs | 14 +
ambari-web/app/templates/main/dashboard.hbs | 2 +-
.../main/dashboard/widgets/cluster_metrics.hbs | 12 +-
.../main/dashboard/widgets/hbase_links.hbs | 15 +-
.../main/dashboard/widgets/hdfs_links.hbs | 17 +-
.../main/dashboard/widgets/pie_chart.hbs | 21 +-
.../main/dashboard/widgets/simple_text.hbs | 21 +-
.../templates/main/dashboard/widgets/uptime.hbs | 16 +-
.../main/dashboard/widgets/yarn_links.hbs | 18 +-
.../main/service/all_services_actions.hbs | 6 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
ambari-web/app/utils/validator.js | 8 +
ambari-web/app/views/common/chart/pie.js | 10 +-
.../configs/service_config_container_view.js | 2 +-
ambari-web/app/views/loading.js | 2 +-
ambari-web/app/views/main/admin.js | 14 +-
.../views/main/admin/kerberos/disable_view.js | 3 +-
.../main/admin/stack_upgrade/services_view.js | 2 +-
.../main/alerts/definition_details_view.js | 2 +-
.../dashboard/widgets/cluster_metrics_widget.js | 3 -
.../main/dashboard/widgets/pie_chart_widget.js | 23 +-
ambari-web/app/views/main/menu.js | 16 +-
ambari-web/app/views/main/service/item.js | 2 +-
...anage_alert_notifications_controller_test.js | 38 +-
ambari-web/test/utils/config_test.js | 2 +-
.../admin/stack_upgrade/services_view_test.js | 1 +
.../main/alerts/definition_details_view_test.js | 2 +-
.../src/main/assemblies/odpi-ambari-mpack.xml | 2 +-
.../main/resources/ui/app/models/worksheet.js | 1 +
.../resources/ui/app/routes/queries/query.js | 15 +-
.../ui/app/routes/queries/query/results.js | 6 +-
.../templates/components/query-result-table.hbs | 92 ++--
.../ui/app/templates/queries/query.hbs | 10 +-
.../ui/app/templates/queries/query/log.hbs | 12 +-
.../ui/app/templates/queries/query/results.hbs | 9 +-
.../src/main/resources/ui/ember-cli-build.js | 1 +
.../resources/ui/vendor/browser-pollyfills.js | 213 ++++++++
docs/pom.xml | 2 +-
392 files changed, 5474 insertions(+), 2497 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index bd4c9dd,3a650ef..60df8cf
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@@ -26,14 -26,11 +26,14 @@@ import java.util.Set
import org.apache.ambari.annotations.Experimental;
import org.apache.ambari.annotations.ExperimentalFeature;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.RoleCommand;
-import org.apache.ambari.server.state.ServiceInfo;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Service;
+import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.utils.StageUtils;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
import com.google.gson.annotations.SerializedName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/382da979/ambari-web/app/messages.js
----------------------------------------------------------------------