Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8351106f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8351106f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8351106f Branch: refs/heads/master Commit: 8351106f1b34c7306cff6c04325506c10f4a5673 Parents: c2cbf4d 6d25133 Author: Imesh Gunaratne <[email protected]> Authored: Mon Oct 28 13:55:52 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Oct 28 13:55:52 2013 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 17 ++++------ .../controller/iaases/OpenstackNovaIaas.java | 19 +++++------ .../impl/CloudControllerServiceImpl.java | 30 ++--------------- .../util/CloudControllerConstants.java | 7 ++-- .../cloud/controller/util/ServiceContext.java | 35 +++++++++++++------- 5 files changed, 43 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
