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 2015/11/11 14:57:42 UTC
[1/2] incubator-slider git commit: SLIDER-960 switch to groovy 2.4.4
(the ASF edition), with the faster java7 build
Repository: incubator-slider
Updated Branches:
refs/heads/develop fed5d0346 -> c4e732915
SLIDER-960 switch to groovy 2.4.4 (the ASF edition), with the faster java7 build
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/618782a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/618782a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/618782a9
Branch: refs/heads/develop
Commit: 618782a9b66e0ae35e79d07888fec45d19ccb421
Parents: fed5d03
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 11 13:57:14 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 11 13:57:14 2015 +0000
----------------------------------------------------------------------
pom.xml | 7 +++++++
slider-core/pom.xml | 1 +
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/618782a9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3943ea9..866c448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -511,6 +511,13 @@
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <classifier>indy</classifier>
+ <version>${groovy.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>${jcommander.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/618782a9/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 704fa06..c7e8933 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -225,6 +225,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
+ <classifier>indy</classifier>
<scope>test</scope>
</dependency>
[2/2] incubator-slider git commit: javadoc tweak on
createZookeepernode
Posted by st...@apache.org.
javadoc tweak on createZookeepernode
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c4e73291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c4e73291
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c4e73291
Branch: refs/heads/develop
Commit: c4e7329152283cb3183fe7de859382daf6aad519
Parents: 618782a
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 11 13:57:37 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 11 13:57:37 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/slider/client/SliderClient.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c4e73291/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index eeda1e3..59e6848 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -503,6 +503,13 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
/**
* Create the zookeeper node associated with the calling user and the cluster
+ *
+ * @param clusterName slider application name
+ * @param nameOnly should the name only be created (i.e. don't create ZK node)
+ * @return the path, using the policy implemented in
+ * {@link ZKIntegration#mkClusterPath(String, String)}
+ * @throws YarnException
+ * @throws IOException
*/
@VisibleForTesting
public String createZookeeperNode(String clusterName, Boolean nameOnly) throws YarnException, IOException {
@@ -522,7 +529,8 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
* -throwing exceptions on any failure
* @param clusterName cluster name
* @param nameOnly create the path, not the node
- * @return the path, with the node created
+ * @return the path, using the policy implemented in
+ * {@link ZKIntegration#mkClusterPath(String, String)}
* @throws YarnException
* @throws IOException
* @throws KeeperException