This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 6912c6534e6e503c976545aca4bd78ed9d3ee129
Merge: 133febc 59998a8
Author: Jayush Luniya <jlun...@hortonworks.com>
AuthorDate: Thu Feb 22 12:15:37 2018 -0800
Merge branch 'scottduan-AMBARI-22878-branch-feature-AMBARI-14714' into
branch-feature-AMBARI-14714
.../server/controller/ServiceGroupRequest.java | 27 +-
.../server/controller/ServiceGroupResponse.java | 40 +-
.../AbstractAuthorizedResourceProvider.java | 2 +-
.../internal/ServiceGroupResourceProvider.java | 36 +-
.../server/orm/entities/ServiceGroupEntity.java | 24 +-
.../org/apache/ambari/server/state/Cluster.java | 4 +-
.../apache/ambari/server/state/ServiceGroup.java | 2 +
.../ambari/server/state/ServiceGroupFactory.java | 1 +
.../ambari/server/state/ServiceGroupImpl.java | 34 +-
.../ambari/server/state/cluster/ClusterImpl.java | 12 +-
.../ambari/server/topology/AmbariContext.java | 2 +-
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 4 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 4 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 4 +-
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 3 +-
.../actionmanager/ExecutionCommandWrapperTest.java | 2 +-
.../TestActionSchedulerThreading.java | 2 +-
.../server/agent/HeartbeatProcessorTest.java | 2 +-
.../ambari/server/agent/TestHeartbeatHandler.java | 2 +-
.../ambari/server/agent/TestHeartbeatMonitor.java | 10 +-
.../server/api/services/AmbariMetaInfoTest.java | 8 +-
.../configuration/RecoveryConfigHelperTest.java | 12 +-
.../AmbariCustomCommandExecutionHelperTest.java | 2 +-
.../controller/AmbariManagementControllerTest.java | 40 +-
.../ServiceDependencyResourceProviderTest.java | 4 +-
...ServiceGroupDependencyResourceProviderTest.java | 4 +-
.../internal/ServiceGroupResourceProviderTest.java | 102 +-
.../internal/StackDefinedPropertyProviderTest.java | 2 +-
.../internal/UpgradeResourceProviderTest.java | 2085 ++++++++++++++
.../UpgradeSummaryResourceProviderTest.java | 2 +-
.../VersionDefinitionResourceProviderTest.java | 2 +-
.../state/GeneralServiceCalculatedStateTest.java | 2 +-
.../apache/ambari/server/events/EventsTest.java | 2 +-
.../upgrade/HostVersionOutOfSyncListenerTest.java | 4 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 3 +-
.../server/orm/dao/AlertDispatchDAOTest.java | 2 +-
.../ambari/server/orm/dao/AlertsDAOTest.java | 2 +-
.../upgrades/ComponentVersionCheckActionTest.java | 4 +-
.../serveraction/upgrades/ConfigureActionTest.java | 1854 +++++++++++++
.../upgrades/CreateAndConfigureActionTest.java | 2 +-
.../serveraction/upgrades/UpgradeActionTest.java | 696 +++++
.../ambari/server/state/ConfigHelperTest.java | 2 +-
.../ambari/server/state/ServiceComponentTest.java | 2 +-
.../apache/ambari/server/state/ServiceTest.java | 10 +-
.../ambari/server/state/UpgradeHelperTest.java | 2911 ++++++++++++++++++++
.../state/alerts/AlertEventPublisherTest.java | 2 +-
.../server/state/alerts/InitialAlertEventTest.java | 2 +-
.../server/state/cluster/ClusterDeadlockTest.java | 2 +-
.../server/state/cluster/ClusterImplTest.java | 2 +-
.../ambari/server/state/cluster/ClusterTest.java | 6 +-
.../server/state/cluster/ClustersDeadlockTest.java | 2 +-
.../ambari/server/state/cluster/ClustersTest.java | 2 +-
.../ConcurrentServiceConfigVersionTest.java | 2 +-
...ceComponentHostConcurrentWriteDeadlockTest.java | 2 +-
.../svccomphost/ServiceComponentHostTest.java | 8 +-
.../server/testing/DBInconsistencyTests.java | 2 +-
.../ambari/server/topology/AmbariContextTest.java | 2 +-
59 files changed, 7882 insertions(+), 136 deletions(-)
--
To stop receiving notification emails like this one, please contact
jlun...@apache.org.
