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/271e6632 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/271e6632 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/271e6632 Branch: refs/heads/master Commit: 271e6632ad4fee6d98c43c6d6bcce428e1da91f1 Parents: 42f4e0f 3a5b5d0 Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 15:30:32 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 15:30:32 2013 +0530 ---------------------------------------------------------------------- .../bean/util/converter/PojoConverter.java | 4 +- .../pom.xml | 8 +++ .../modules/distribution/src/assembly/bin.xml | 3 +- .../src/main/conf/cartridge-config.properties | 65 ++++++++++++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
