Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7e8c3df2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7e8c3df2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7e8c3df2 Branch: refs/heads/master Commit: 7e8c3df2e31a4d651946333ad97f8dfc3139c5ba Parents: ddc24cd ec53ed6 Author: anuruddhal <[email protected]> Authored: Tue May 19 20:28:41 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Tue May 19 20:28:41 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/context/cluster/ClusterContext.java | 12 ++++-------- .../context/cluster/ClusterContextFactory.java | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
