Merge branch 'feature/SLIDER-779_Move_to_Groovy_2.4.0' 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/213fd9e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/213fd9e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/213fd9e8 Branch: refs/heads/develop Commit: 213fd9e8ffcf410cb74b5a48e1075fddef000cd1 Parents: c927bad 3e646c7 Author: Steve Loughran <[email protected]> Authored: Wed Feb 25 17:42:19 2015 -0800 Committer: Steve Loughran <[email protected]> Committed: Wed Feb 25 17:42:19 2015 -0800 ---------------------------------------------------------------------- pom.xml | 6 +-- slider-assembly/pom.xml | 2 +- .../common/params/AbstractActionArgs.java | 4 +- .../apache/slider/common/params/CommonArgs.java | 2 +- .../apache/slider/common/tools/SliderUtils.java | 3 +- .../slider/client/TestCommonArgParsing.groovy | 40 +++++++++++++++----- .../view/TestClusterSpecificationBlock.groovy | 2 +- .../web/view/TestContainerStatsBlock.groovy | 26 +++++++++---- .../appmaster/web/view/TestIndexBlock.groovy | 2 +- .../org/apache/slider/test/KeysForTests.groovy | 2 + .../apache/slider/test/SliderTestUtils.groovy | 15 ++++---- .../funtest/framework/FileUploader.groovy | 6 +-- 12 files changed, 73 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
