Merge branch 'feature/SLIDER-550_custom_JVM_ops_lose_slider_conf_dir' 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/e13d20e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e13d20e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e13d20e3 Branch: refs/heads/develop Commit: e13d20e3a31b26e1353f87c8c69ab0cf0efd8746 Parents: 46e131d b48ad06 Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 22 10:37:15 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 22 10:37:15 2014 +0100 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider | 5 +++-- slider-assembly/src/main/scripts/slider.py | 21 +++++++++++--------- .../funtest/framework/CommandTestBase.groovy | 13 +++++++++--- .../funtest/framework/FuntestProperties.groovy | 5 +++++ .../funtest/lifecycle/AgentRegistryIT.groovy | 5 ++--- 5 files changed, 32 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
