Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into service_aware_lb
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/37bc6370 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/37bc6370 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/37bc6370 Branch: refs/heads/master Commit: 37bc63703220b816dca4248efec4d23a74410a92 Parents: 9c794ca e046af8 Author: Isuru <[email protected]> Authored: Wed Apr 9 17:05:55 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Apr 9 17:05:55 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/manager/CartridgeSubscriptionManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
