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/97a2b8ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/97a2b8ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/97a2b8ee Branch: refs/heads/master Commit: 97a2b8ee0c466f185d5b489a61ec4088d11cb1d6 Parents: 8d1c338 b4de7ba Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 25 16:35:05 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 25 16:35:05 2013 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/autoscaler/PartitionContext.java | 2 +- .../src/test/resources/test-minimum-autoscaler-rule.drl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
