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/1f1230cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1f1230cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1f1230cb Branch: refs/heads/master Commit: 1f1230cb23a5fc5862a099ecb79bed1dfa5f4550 Parents: 45b6618 a0d6ce5 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Jan 10 22:29:36 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Jan 10 22:29:36 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/Constants.java | 2 +- .../cloud/controller/CloudControllerClient.java | 2 +- .../controller/InstanceNotificationClient.java | 6 ++-- .../controllers/cartridgeDefintionSubmit.jag | 8 ++++++ .../theme1/partials/cartridge_deployments.hbs | 21 ++++++++------ .../console/util/utility.jag | 4 +++ .../SubscriptionMultiTenantBehaviour.java | 29 +++++++++++++++++--- 7 files changed, 54 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
