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/b5274239 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b5274239 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b5274239 Branch: refs/heads/master Commit: b5274239aeb6d3b8c9c8a0ab3e711ac73bce2d4d Parents: 1eacb61 51dff13 Author: Manula Thantriwatte <[email protected]> Authored: Mon Nov 10 16:02:48 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Mon Nov 10 16:02:48 2014 +0000 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 15 +++++++++++++-- .../apache/stratos/autoscaler/pojo/Dependencies.java | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
