Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9758c836 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9758c836 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9758c836 Branch: refs/heads/master Commit: 9758c83649ed483d57abffac5105250b1d2611e1 Parents: df7db41 2758d93 Author: Imesh Gunaratne <[email protected]> Authored: Fri Oct 24 12:48:00 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Oct 24 12:48:00 2014 +0530 ---------------------------------------------------------------------- .../config/all/repository/conf/cloud-controller.xml | 4 ++-- .../config/cc/repository/conf/cloud-controller.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
