Merge remote-tracking branch 'origin/develop' 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/8f3703ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8f3703ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8f3703ba Branch: refs/heads/develop Commit: 8f3703ba36abc07d77d5ee671762628a489f8a07 Parents: f70cc2c 9f1f687 Author: Steve Loughran <[email protected]> Authored: Fri Jun 5 09:32:48 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Fri Jun 5 09:32:48 2015 +0100 ---------------------------------------------------------------------- .../providers/agent/AgentProviderService.java | 16 ++- .../package/scripts/all.py | 11 +- .../package/scripts/cl.py | 13 +-- .../package/scripts/COMMAND_LOGGER.py | 17 ++- .../add-on-package-echo/package/scripts/echo.py | 7 +- .../appConfig.json | 22 ++++ .../metainfo.xml | 42 ++++++++ .../package/scripts/COMMAND_LOGGER.py | 62 +++++++++++ ...nentConfigsInAppConfigShowUpOnAgentIT.groovy | 106 +++++++++++++++++++ .../ApplicationWithAddonPackagesIT.groovy | 2 - 10 files changed, 261 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
