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/e5fd231f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e5fd231f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e5fd231f Branch: refs/heads/master Commit: e5fd231f552cc20cdfc58fce318a10dd266240c2 Parents: 7709385 de73990 Author: Udara Liyanage <[email protected]> Authored: Tue Dec 10 17:12:43 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 10 17:12:43 2013 -0500 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 4 ++-- .../endpoint/bean/util/converter/PojoConverter.java | 14 +++++++------- .../stratos/rest/endpoint/services/ServiceUtils.java | 2 +- .../pom.xml | 8 ++++++-- 4 files changed, 16 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
