AMBARI-21677. Upgrade Pre-Checks Should Take PATCH/SERVICE Types Into Account - fix import
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1433ecff Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1433ecff Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1433ecff Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 1433ecff108df159f71961e23a34d248e1684c85 Parents: 655c3c6 Author: Attila Doroszlai <adorosz...@hortonworks.com> Authored: Thu Aug 10 11:56:16 2017 +0200 Committer: Attila Doroszlai <adorosz...@hortonworks.com> Committed: Thu Aug 10 11:56:16 2017 +0200 ---------------------------------------------------------------------- .../apache/ambari/server/checks/AbstractCheckDescriptorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1433ecff/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 1b87b30..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; @@ -303,4 +303,4 @@ public class AbstractCheckDescriptorTest extends EasyMockSupport { throws AmbariException { } } -} \ No newline at end of file +}