AMBARI-21672 - Update Orchestration to support MAINT (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/053cfc9f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/053cfc9f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/053cfc9f Branch: refs/heads/branch-2.6 Commit: 053cfc9fbbba22074d45523308e63402cf0cced4 Parents: 6cb8500 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Tue Aug 8 10:19:39 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Tue Aug 8 10:20:08 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/state/UpgradeContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/053cfc9f/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java index e04be5e..629ea9b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java @@ -38,13 +38,13 @@ import org.apache.ambari.server.state.repository.VersionDefinitionXml; import org.apache.ambari.server.state.stack.UpgradePack; import org.apache.ambari.server.state.stack.upgrade.Direction; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; -import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Lists; 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.Lists; import com.google.common.collect.Sets; /**
