Repository: incubator-slider Updated Branches: refs/heads/develop b72114850 -> 97c175302
SLIDER-531 : slip registering AM IPC endpoints so that jenkins compiles again. Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/97c17530 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/97c17530 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/97c17530 Branch: refs/heads/develop Commit: 97c1753023c6de12dd06ecc60d5288963b3cd8bf Parents: b721148 Author: Steve Loughran <[email protected]> Authored: Sun Nov 2 18:54:21 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Sun Nov 2 18:54:21 2014 +0000 ---------------------------------------------------------------------- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/97c17530/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 3bee4a4..a3c9b95 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 @@ -1057,11 +1057,15 @@ public class SliderAppMaster extends AbstractSliderLaunchedService PersistencePolicies.APPLICATION); serviceRecord.description = "Slider Application Master"; +/* SLIDER-531: disable this addition so things compile against versions of +the registry with/without the new record format + serviceRecord.addExternalEndpoint( RegistryTypeUtils.ipcEndpoint( CustomRegistryConstants.AM_IPC_PROTOCOL, rpcServiceAddress)); - + + */ // internal services sliderAMProvider.applyInitialRegistryDefinitions(amWebURI, agentOpsURI,
