Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21450 aaf2110d2 -> 6c5faee5c
Upgrade Pre-Checks Should Take PATCH/SERVICE Types Into Account (part2) (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c5faee5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c5faee5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c5faee5 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 6c5faee5c0eeeea5233b783797c62a47713dc1d9 Parents: aaf2110 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Thu Aug 10 10:51:21 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Thu Aug 10 10:51:38 2017 -0400 ---------------------------------------------------------------------- .../apache/ambari/server/checks/AbstractCheckDescriptorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6c5faee5/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java index c294ee7..092bd0b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java @@ -36,13 +36,13 @@ import org.apache.ambari.server.state.repository.VersionDefinitionXml; import org.apache.ambari.server.state.stack.PrereqCheckType; import org.apache.ambari.server.state.stack.PrerequisiteCheck; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; -import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Sets; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.easymock.Mock; import org.junit.Before; import org.junit.Test; +import com.google.common.collect.Sets; import com.google.inject.Provider; import junit.framework.Assert;
