Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/910d536d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/910d536d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/910d536d Branch: refs/heads/master Commit: 910d536d2e413614bf1f2d5b09419e379fbc5b20 Parents: 06c9e3a 9ac01eb Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 26 03:59:11 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 26 03:59:11 2013 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 3 ++- .../apache/stratos/autoscaler/partition/PartitionManager.java | 4 ++-- .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 4 ++++ .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
