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/c03a42a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c03a42a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c03a42a6 Branch: refs/heads/master Commit: c03a42a6e51e61fdd31918ed6440bcf7f9183743 Parents: 8c72f14 4cd05fe Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 25 15:24:46 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 25 15:24:46 2013 +0530 ---------------------------------------------------------------------- .../message/receiver/topology/AutoscalerTopologyReceiver.java | 1 + .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
