You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/07/09 10:15:50 UTC
ambari git commit: AMBARI-21430. Allow Multiple Versions of Stack
Tools to Co-Exist - fix illegal import
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 6a3bfd5d0 -> f01d4a3c2
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/f01d4a3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f01d4a3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f01d4a3c
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: f01d4a3c2b79e1d09882e685c70c8498822e781d
Parents: 6a3bfd5
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Sun Jul 9 12:15:28 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Sun Jul 9 12:15:28 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/f01d4a3c/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 e7764b8..6d2ab84 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;