Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f0303b05 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f0303b05 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f0303b05 Branch: refs/heads/docker-grouping-merge Commit: f0303b0509dc6af690d72f9f9fb48641775405f0 Parents: c1e557b aca1edf Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 4 14:48:13 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 4 14:48:13 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/api/AutoScalerServiceImpl.java | 11 ++++++++--- .../interfaces/AutoScalerServiceInterface.java | 2 +- .../rest/endpoint/bean/util/converter/PojoConverter.java | 4 ++-- .../org.apache.stratos.autoscaler.service.stub/pom.xml | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
