Repository: ambari Updated Branches: refs/heads/trunk d0d6f885c -> f3e8023dc
AMBARI-18052 - Starting a Component After Pausing An Upgrade Can Take 9 Minutes (part2) (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3e8023d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3e8023d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3e8023d Branch: refs/heads/trunk Commit: f3e8023dca50a9bfa6aa88ea835ae54b465a70d5 Parents: d0d6f88 Author: Jonathan Hurley <[email protected]> Authored: Sat Aug 6 15:36:43 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Sat Aug 6 15:36:43 2016 -0400 ---------------------------------------------------------------------- .../ambari/server/controller/internal/UpgradeResourceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e8023d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index 1f7fd4d..d37e32b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -114,11 +114,11 @@ import org.apache.ambari.server.state.stack.upgrade.UpgradeType; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject;
