You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/03 12:35:12 UTC
[2/2] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a7d0473d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a7d0473d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a7d0473d
Branch: refs/heads/master
Commit: a7d0473dade875124967986fded424a3ccdec898
Parents: 0e449d3 57b1dcf
Author: Dinithi <di...@wso2.com>
Authored: Tue Mar 3 17:03:02 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue Mar 3 17:03:02 2015 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 16 ++++++++++---
.../stratos/autoscaler/util/AutoscalerUtil.java | 25 +++++++++++++++++++-
.../artifacts/application-policy.json | 4 ----
3 files changed, 37 insertions(+), 8 deletions(-)
----------------------------------------------------------------------