Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/6744e7db Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6744e7db Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6744e7db Branch: refs/heads/develop Commit: 6744e7dbce3744a46255c5aaf0464ab8e7fff70d Parents: 846310c 7003c06 Author: Steve Loughran <ste...@apache.org> Authored: Wed Jun 18 17:50:19 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Jun 18 17:50:19 2014 -0700 ---------------------------------------------------------------------- slider-funtest/pom.xml | 4 ---- .../funtest/framework/CommandTestBase.groovy | 1 - .../funtest/framework/FuntestProperties.groovy | 5 ----- .../lifecycle/AgentCommandTestBase.groovy | 19 +++++++++++++++++ .../lifecycle/TestAgentClusterLifecycle.groovy | 8 +++---- .../lifecycle/TestAppsThroughAgent.groovy | 22 ++------------------ 6 files changed, 24 insertions(+), 35 deletions(-) ----------------------------------------------------------------------