Repository: ambari
Updated Branches:
  refs/heads/trunk 3155a43e5 -> 4dee0f0e8


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/4dee0f0e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4dee0f0e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4dee0f0e

Branch: refs/heads/trunk
Commit: 4dee0f0e838265d124dd3066b27760acb57c4cb5
Parents: 3155a43
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:21:23 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/4dee0f0e/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;
 
 /**

Reply via email to