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/8a036e5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8a036e5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8a036e5f Branch: refs/heads/master Commit: 8a036e5f71563f1fb8d71c55e6d5255af99da0b4 Parents: e9453e7 9a15beb Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 22:26:12 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 22:26:12 2013 +0530 ---------------------------------------------------------------------- .../controller/topology/TopologyBuilder.java | 9 ++------ .../messaging/domain/topology/Cluster.java | 22 +++++++------------- .../ClusterCreatedMessageProcessor.java | 2 +- .../conf/templates/jndi.properties.template | 2 ++ 4 files changed, 13 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
