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/91c5a1a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/91c5a1a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/91c5a1a7 Branch: refs/heads/master Commit: 91c5a1a7c181a53e78dd7cbbcdf68abfb1679d86 Parents: eddc0b5 6535864 Author: Melan Nimesh <[email protected]> Authored: Fri Jan 31 10:23:21 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Fri Jan 31 10:23:21 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/partition/PartitionManager.java | 36 +++--- .../stratos/cli/RestCommandLineService.java | 9 -- .../manager/client/AutoscalerServiceClient.java | 2 +- .../subscription/DataCartridgeSubscription.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 2 +- .../rest/endpoint/services/StratosAdmin.java | 2 +- tools/puppet/manifests/classes/mysql.pp | 122 +++++++++++++++++++ tools/puppet/manifests/nodes.pp | 16 ++- 8 files changed, 159 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
