SLIDER-149 in sync with YARN-913 API Changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6e9380c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6e9380c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6e9380c0 Branch: refs/heads/develop Commit: 6e9380c084a846eebf0c639d64626014e34db007 Parents: edf7286 Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 11 17:24:14 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 11 17:24:14 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 2 +- .../server/services/yarnregistry/YarnRegistryViewForProviders.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6e9380c0/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index f924ef5..193da3b 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -1009,7 +1009,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService ServiceRecord container = new ServiceRecord( cid, description, - PersistencePolicies.CONTAINER); + PersistencePolicies.CONTAINER, null); try { yarnRegistryOperations.putComponent(cid, container); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6e9380c0/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java b/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java index bea7f78..fc7ec2a 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/yarnregistry/YarnRegistryViewForProviders.java @@ -21,7 +21,7 @@ package org.apache.slider.server.services.yarnregistry; import org.apache.hadoop.yarn.registry.client.binding.BindingUtils; import org.apache.hadoop.yarn.registry.client.binding.RegistryPathUtils; import org.apache.hadoop.yarn.registry.client.services.RegistryOperationsService; -import org.apache.hadoop.yarn.registry.client.types.CreateFlags; +import org.apache.hadoop.yarn.registry.client.api.CreateFlags; import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import java.io.IOException;