Merge branch 'docker-changes-m4' of https://github.com/chamilad/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c8bba8d0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c8bba8d0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c8bba8d0 Branch: refs/heads/master Commit: c8bba8d01bca837eb47bfbb415d4570cd56de50b Parents: 1dc3b27 9a47586 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Nov 20 17:25:19 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Nov 20 17:25:19 2014 +0530 ---------------------------------------------------------------------- .../cartridgeagent/cartridgeagent/agent.conf | 2 -- .../modules/config/cartridgeagentconfiguration.py | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
