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/17274095 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/17274095 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/17274095 Branch: refs/heads/master Commit: 172740958dc945b2e0b326876f44928dd3e2af06 Parents: 951516d 9694fa2 Author: Udara Liyanage <[email protected]> Authored: Wed Mar 12 07:50:57 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Wed Mar 12 07:50:57 2014 -0400 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 20 ++++++++--------- .../topology/AutoscalerTopologyReceiver.java | 23 ++++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
