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/27 19:37:13 UTC
[1/2] incubator-slider git commit: SLIDER-82 catch up with changed
parent method
Repository: incubator-slider
Updated Branches:
refs/heads/develop cf00b9a5d -> 7b5481b38
SLIDER-82 catch up with changed parent method
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/72d1c8a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/72d1c8a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/72d1c8a9
Branch: refs/heads/develop
Commit: 72d1c8a933387b38aca1f716c1532104f647e1c6
Parents: cf00b9a
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 27 18:35:14 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 27 18:35:14 2015 +0000
----------------------------------------------------------------------
.../org/apache/slider/funtest/lifecycle/DemoAASleep.groovy | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/72d1c8a9/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAASleep.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAASleep.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAASleep.groovy
index 7d0ee46..7a8e1a6 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAASleep.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAASleep.groovy
@@ -20,6 +20,7 @@ package org.apache.slider.funtest.lifecycle
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
+import org.apache.slider.api.types.NodeInformationList
import org.apache.slider.core.launch.SerializedApplicationReport
@CompileStatic
@@ -31,8 +32,9 @@ class DemoAASleep extends AASleepIT {
String name,
SerializedApplicationReport appReport,
int desired,
- int expected) {
- super.operations(name, appReport, desired, expected)
+ int expected,
+ NodeInformationList healthyNodes) {
+ super.operations(name, appReport, desired, expected, healthyNodes)
describe("cluster is live at ${appReport.url}")
[2/2] incubator-slider git commit: SLIDER-1006 update build profiles
to be in sync with hadoop common
Posted by st...@apache.org.
SLIDER-1006 update build profiles to be in sync with hadoop common
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7b5481b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7b5481b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7b5481b3
Branch: refs/heads/develop
Commit: 7b5481b3875e906f07c935ace32306d394d3dcf4
Parents: 72d1c8a
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 27 18:37:34 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 27 18:37:34 2015 +0000
----------------------------------------------------------------------
pom.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7b5481b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 289993c..cd74dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1671,7 +1671,7 @@
<profile>
<!-- hadoop branch-2 builds -->
- <id>branch-2</id>
+ <id>branch-2.8</id>
<properties>
<hadoop.version>2.8.0-SNAPSHOT</hadoop.version>
<curator.version>2.7.1</curator.version>
@@ -1680,6 +1680,16 @@
</profile>
<profile>
+ <!-- hadoop branch-2 builds -->
+ <id>branch-2</id>
+ <properties>
+ <hadoop.version>2.9.0-SNAPSHOT</hadoop.version>
+ <curator.version>2.7.1</curator.version>
+ <zookeeper.version>3.4.6</zookeeper.version>
+ </properties>
+ </profile>
+
+ <profile>
<!-- hadoop trunk builds -->
<id>trunk</id>
<properties>