AMBARI-21430. Allow Multiple Versions of Stack Tools to Co-Exist - fix illegal import
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d0f7a515 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d0f7a515 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d0f7a515 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: d0f7a51537469740e5397486b1e2c19862c26c01 Parents: f33a250 Author: Attila Doroszlai <adorosz...@hortonworks.com> Authored: Sun Jul 9 12:15:28 2017 +0200 Committer: Attila Doroszlai <adorosz...@hortonworks.com> Committed: Sun Jul 9 12:16:54 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d0f7a515/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java index fa3aea3..0656f68 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java @@ -29,7 +29,7 @@ import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.PropertyInfo; -import org.apache.hadoop.metrics2.sink.relocated.commons.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import com.google.common.collect.Sets; import com.google.inject.Inject;
