Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dbfc27fe Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dbfc27fe Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dbfc27fe Branch: refs/heads/master Commit: dbfc27fe81762cc1120e0028f5b8e17eaea8815c Parents: 6a82e67 e6133c8 Author: reka <[email protected]> Authored: Fri Jun 19 18:30:20 2015 +0530 Committer: reka <[email protected]> Committed: Fri Jun 19 18:30:20 2015 +0530 ---------------------------------------------------------------------- .../services/impl/AutoscalerServiceImpl.java | 24 ++- .../rest/endpoint/api/StratosApiV41.java | 29 ++-- .../rest/endpoint/api/StratosApiV41Utils.java | 150 +++++++++---------- .../exception/InvalidCartridgeException.java | 70 +++++++++ 4 files changed, 180 insertions(+), 93 deletions(-) ----------------------------------------------------------------------
