You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/04 11:51:07 UTC
[25/45] git commit: Merge remote-tracking branch
'neykov/yaml-promote-app' into osgi2
Merge remote-tracking branch 'neykov/yaml-promote-app' into osgi2
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a3915225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a3915225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a3915225
Branch: refs/heads/master
Commit: a3915225ee0bb337159c49837344399757d58994
Parents: 74ddd83 c43eb16
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 2 16:13:03 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jul 2 16:13:03 2014 +0100
----------------------------------------------------------------------
.../BrooklynAssemblyTemplateInstantiator.java | 80 +++++++++++++++-----
.../io/brooklyn/camp/brooklyn/WrapAppTest.java | 75 ++++++++++++++++++
2 files changed, 134 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a3915225/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
----------------------------------------------------------------------