Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c1717248 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c1717248 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c1717248 Branch: refs/heads/master Commit: c1717248adaaf3dd2d3b638b3172867d5120d09d Parents: 57f9529 7057d7c Author: Nirmal Fernando <[email protected]> Authored: Wed Apr 2 16:49:43 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Apr 2 16:49:43 2014 +0530 ---------------------------------------------------------------------- .../policy/model/AutoscalePolicy.java | 2 +- .../subscription/LBCartridgeSubscription.java | 13 ++- .../handlers/StratosAuthorizingHandler.java | 2 +- .../src/main/resources/p2.inf | 17 ++++ .../distribution/src/main/resources/launch.ini | 19 +++++ .../distribution/src/main/bin/version.txt | 1 - products/stratos-manager/conf/README-STRATOS | 90 -------------------- products/stratos/conf/README-STRATOS | 90 -------------------- .../distribution/src/main/resources/launch.ini | 19 +++++ .../modules/p2-profile-gen/carbon.product | 20 +++++ 10 files changed, 86 insertions(+), 187 deletions(-) ----------------------------------------------------------------------
