Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/409594d7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/409594d7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/409594d7 Branch: refs/heads/master Commit: 409594d74b74991ace85e90f51b76dae2ffe2e41 Parents: 6cdfc8a 8906c14 Author: Imesh Gunaratne <[email protected]> Authored: Sat Nov 8 22:33:05 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sat Nov 8 22:33:05 2014 +0530 ---------------------------------------------------------------------- .../client/CloudControllerClient.java | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
