Merge branch 'feature/SLIDER-460-stderr' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c87b082d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c87b082d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c87b082d Branch: refs/heads/develop Commit: c87b082d7c087d14879a94676106bfaeb23e2b02 Parents: ec07bdc 802ff46 Author: Steve Loughran <ste...@apache.org> Authored: Thu Oct 23 11:36:46 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Oct 23 11:36:46 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 61 ++++--- .../slider/client/SliderYarnClientImpl.java | 37 ++++ .../agent/actions/TestActionExists.groovy | 15 +- .../framework/AgentCommandTestBase.groovy | 32 +--- .../funtest/framework/CommandTestBase.groovy | 167 +++++++++++++++---- .../funtest/lifecycle/AMFailuresIT.groovy | 54 ++---- .../lifecycle/AgentClusterLifecycleIT.groovy | 7 +- .../funtest/lifecycle/AgentFailures2IT.groovy | 33 +--- .../funtest/lifecycle/AgentFailuresIT.groovy | 41 +---- .../funtest/lifecycle/AppsThroughAgentIT.groovy | 3 +- .../AppsThroughAgentQueueAndLabelsIT.groovy | 37 +--- .../src/test/resources/log4j.properties | 2 +- 12 files changed, 261 insertions(+), 228 deletions(-) ----------------------------------------------------------------------