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/029958d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/029958d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/029958d3 Branch: refs/heads/master Commit: 029958d3b77b45baa3389c1258ddf98258f9feb2 Parents: c8f2bcb ff3afed Author: Sajith Kariyawasam <[email protected]> Authored: Sun Jan 12 10:21:00 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Sun Jan 12 10:21:00 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/deploy/service/Service.java | 13 ++++++++++- .../service/ServiceDeploymentManager.java | 11 ++++++++++ .../manager/lookup/LookupDataHolder.java | 23 ++++++++++++++++++++ .../lookup/TenantIdToSubscriptionContext.java | 6 +++++ .../DataInsertionAndRetrievalManager.java | 14 ++++++++++++ 5 files changed, 66 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
