Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f195960a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f195960a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f195960a Branch: refs/heads/master Commit: f195960a4e2b454442e08442360f42b0c6f9fb85 Parents: 34f831f 85ac579 Author: Pradeep Fernando <[email protected]> Authored: Tue Feb 4 00:49:30 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Tue Feb 4 00:49:30 2014 +0530 ---------------------------------------------------------------------- .../service/ServiceDeploymentManager.java | 37 ++++++++++++----- .../rest/endpoint/services/ServiceUtils.java | 42 ++++++++++++++------ 2 files changed, 55 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
