You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/10/28 13:44:09 UTC
[1/2] git commit: SLIDER-531 -keep in sync with latest YARN changes
Repository: incubator-slider
Updated Branches:
refs/heads/feature/SLIDER-531-registry-enhancements b0c222430 -> 64836e835
SLIDER-531 -keep in sync with latest YARN 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/a4d156b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a4d156b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a4d156b4
Branch: refs/heads/feature/SLIDER-531-registry-enhancements
Commit: a4d156b41131cd8d8deb97b31db11e93d01bb79d
Parents: b0c2224
Author: Steve Loughran <st...@apache.org>
Authored: Mon Oct 27 17:57:25 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Oct 27 17:57:45 2014 +0000
----------------------------------------------------------------------
.../server/appmaster/web/rest/registry/PathEntryMarshalling.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a4d156b4/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
index 937bebf..5f987c2 100644
--- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/PathEntryMarshalling.groovy
@@ -23,6 +23,6 @@ import org.apache.hadoop.registry.client.binding.JsonSerDeser
class PathEntryMarshalling
extends JsonSerDeser<PathEntryResource> {
public PathEntryMarshalling() {
- super(PathEntryResource.class, new byte[0]);
+ super(PathEntryResource.class);
}
}
\ No newline at end of file
[2/2] git commit: upgrade "use a URI in the api" from a SHOULD to a
MUST; fix examples and tests accordingly
Posted by st...@apache.org.
upgrade "use a URI in the api" from a SHOULD to a MUST; fix examples and tests accordingly
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/64836e83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/64836e83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/64836e83
Branch: refs/heads/feature/SLIDER-531-registry-enhancements
Commit: 64836e835adf35d19c75d4e4932ce0c1a158281d
Parents: a4d156b
Author: Steve Loughran <st...@apache.org>
Authored: Mon Oct 27 18:56:25 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Oct 27 18:56:25 2014 +0000
----------------------------------------------------------------------
.../registry/info/CustomRegistryConstants.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/64836e83/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java b/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
index 67b9feb..0a3476c 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/info/CustomRegistryConstants.java
@@ -24,31 +24,31 @@ package org.apache.slider.core.registry.info;
public class CustomRegistryConstants {
public static final String MANAGEMENT_REST_API =
- "org.apache.slider.management";
+ "classpath:org.apache.slider.management";
public static final String REGISTRY_REST_API =
- "org.apache.slider.registry";
+ "classpath:org.apache.slider.registry";
public static final String PUBLISHER_REST_API =
- "org.apache.slider.publisher";
+ "classpath:org.apache.slider.publisher";
public static final String PUBLISHER_CONFIGURATIONS_API =
- "org.apache.slider.publisher.configurations";
+ "classpath:org.apache.slider.publisher.configurations";
public static final String PUBLISHER_EXPORTS_API =
- "org.apache.slider.publisher.exports";
+ "classpath:org.apache.slider.publisher.exports";
public static final String PUBLISHER_DOCUMENTS_API =
- "org.apache.slider.publisher.documents";
+ "classpath:org.apache.slider.publisher.documents";
public static final String AGENT_SECURE_REST_API =
- "org.apache.slider.agents.secure";
+ "classpath:org.apache.slider.agents.secure";
public static final String AGENT_ONEWAY_REST_API =
- "org.apache.slider.agents.oneway";
+ "classpath:org.apache.slider.agents.oneway";
public static final String AM_IPC_PROTOCOL =
- "org.apache.slider.appmaster";
+ "classpath:org.apache.slider.appmaster";
- public static final String WEB_UI = "org.apache.http.UI";
+ public static final String WEB_UI = "http://";
}