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/ab50491e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ab50491e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ab50491e Branch: refs/heads/master Commit: ab50491e570a6b45d99a551af75e6dadb667871d Parents: 5722b69 0c9a2b8 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Dec 12 23:09:20 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Dec 12 23:09:20 2013 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../java/org/apache/stratos/autoscaler/policy/PolicyManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
