Merge branch 'master' of https://github.com/apache/stratos into tenant-isolation-v1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/20787782 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/20787782 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/20787782 Branch: refs/heads/tenantisolation Commit: 20787782c8aad6023782b7713e32b51bab8b6880 Parents: 829e333 a42e84d Author: Dinithi <[email protected]> Authored: Sat Jun 27 10:57:25 2015 +0530 Committer: Dinithi <[email protected]> Committed: Sat Jun 27 10:57:25 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/context/CloudControllerContext.java | 8 ++++++-- .../autoscaler/service/axiom/CloudControllerContextTest.java | 2 +- .../rest/endpoint/util/converter/ObjectConverter.java | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/20787782/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ----------------------------------------------------------------------
