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/fdaae7ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fdaae7ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fdaae7ee Branch: refs/heads/develop Commit: fdaae7eed70c44e9f71ed1a7010d5a200abf2220 Parents: a133d12 586acb6 Author: tedyu <yuzhih...@gmail.com> Authored: Sun Oct 26 08:47:54 2014 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Sun Oct 26 08:47:54 2014 -0700 ---------------------------------------------------------------------- .../accumulo/package/files/accumulo-metrics.xml | 8 +- .../accumulo/package/files/log4j.properties | 3 +- .../python/agent/CustomServiceOrchestrator.py | 68 +++++++++-- .../agent/TestCustomServiceOrchestrator.py | 28 +++++ slider-assembly/pom.xml | 27 +++++ slider-assembly/src/main/scripts/slider | 4 +- slider-assembly/src/main/scripts/slider.py | 12 +- .../src/test/python/scripts/TestSlider.py | 55 +++++++++ slider-assembly/src/test/python/unitTests.py | 118 +++++++++++++++++++ .../org/apache/slider/common/SliderKeys.java | 2 +- .../server/appmaster/SliderAppMaster.java | 4 +- .../standalone/TestStandaloneAgentAM.groovy | 47 ++++++++ .../AppsThroughAgentQueueAndLabelsIT.groovy | 10 +- 13 files changed, 359 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
