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/0e03fe2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0e03fe2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0e03fe2f Branch: refs/heads/master Commit: 0e03fe2f224d62e2fdaa40a2b11f144fe0ed35b6 Parents: ea38150 a6610f1 Author: Pradeep Fernando <[email protected]> Authored: Tue Jan 7 18:17:56 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Tue Jan 7 18:17:56 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/cli/RestClient.java | 10 +-- .../stratos/cli/beans/TenantInfoBean.java | 8 --- .../stratos/cli/commands/AddTenantCommand.java | 12 ---- .../stratos/rest/endpoint/ServiceHolder.java | 3 +- .../distribution/src/main/assembly/bin.xml | 38 +++++++++--- products/autoscaler/modules/p2-profile/pom.xml | 63 ++++++++++++++++++- .../distribution/src/main/assembly/bin.xml | 41 +++++++++--- .../cloud-controller/modules/p2-profile/pom.xml | 63 ++++++++++++++++++- .../load-balancer/modules/p2-profile/pom.xml | 65 ++++++++++++++++++-- .../modules/distribution/src/assembly/bin.xml | 38 +++++++++--- .../modules/p2-profile-gen/pom.xml | 63 ++++++++++++++++++- tools/stratos-installer/conf/setup.conf | 4 +- 12 files changed, 341 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
