Merge branch 'carbon-4.2.0-upgrade'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dd333f0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dd333f0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dd333f0e Branch: refs/heads/master Commit: dd333f0eeacbb3b3ce2bd79cc5e43da14200287c Parents: 2cf2276 5b14b03 Author: Sajith Kariyawasam <[email protected]> Authored: Mon Jan 6 18:20:29 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Mon Jan 6 18:20:29 2014 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.autoscaler/pom.xml | 2 +- components/org.apache.stratos.cartridge.agent/pom.xml | 4 ++-- components/org.apache.stratos.cartridge.mgt.ui/pom.xml | 2 +- components/org.apache.stratos.cloud.controller/pom.xml | 6 +++--- components/org.apache.stratos.common/pom.xml | 4 ++-- components/org.apache.stratos.logging.view.ui/pom.xml | 4 ++-- components/org.apache.stratos.register.ui/pom.xml | 6 +++--- components/org.apache.stratos.rest.endpoint/pom.xml | 6 +++--- .../java/org/apache/stratos/rest/endpoint/ServiceHolder.java | 2 +- .../apache/stratos/rest/endpoint/services/StratosAdmin.java | 4 ++-- components/org.apache.stratos.sso.redirector.ui/pom.xml | 4 ++-- components/org.apache.stratos.status.monitor.ui/pom.xml | 4 ++-- components/org.apache.stratos.tenant.activity/pom.xml | 2 +- components/org.apache.stratos.tenant.mgt.email.sender/pom.xml | 2 +- components/org.apache.stratos.theme.mgt/pom.xml | 2 +- components/org.apache.stratos.throttling.manager/pom.xml | 2 +- components/org.apache.stratos.usage.summary.helper/pom.xml | 2 +- components/org.apache.stratos.usage/pom.xml | 2 +- components/pom.xml | 1 - .../org.apache.stratos.tenant.mgt.server.feature/pom.xml | 2 +- products/autoscaler/modules/distribution/pom.xml | 4 ++-- products/cloud-controller/modules/distribution/pom.xml | 4 ++-- products/stratos-controller/modules/dashboard/pom.xml | 4 ++-- products/stratos-controller/modules/login/pom.xml | 2 +- products/stratos-controller/modules/p2-profile-gen/pom.xml | 4 ++-- products/stratos-controller/modules/styles/pom.xml | 2 +- 26 files changed, 41 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
