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/e5b4b7d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e5b4b7d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e5b4b7d8 Branch: refs/heads/master Commit: e5b4b7d8d42666d05dac75a6442e2454bd8a94be Parents: acd6fe3 42605bb Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 14:42:59 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 14:42:59 2013 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.autoscaler/pom.xml | 4 ++-- .../src/main/resources/META-INF/component.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
