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/4b63fc9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4b63fc9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4b63fc9f Branch: refs/heads/master Commit: 4b63fc9fdcf7bcfbc80e524c8f0031188dae4998 Parents: 45a5786 4581537 Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 18 11:13:10 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 18 11:13:10 2013 +0530 ---------------------------------------------------------------------- .../stratos/adc/mgt/payload/BasicPayloadData.java | 4 ++-- .../receiver/StratosManagerTopologyReceiver.java | 15 +++++++++++++++ .../cloud/controller/CloudControllerClient.java | 3 +++ 3 files changed, 20 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
