You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/04/21 17:16:21 UTC

[2/2] brooklyn-server git commit: This closes #121

This closes #121

Fix loading yaml CAMP specs from bundles classpath


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8cf7bbcc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8cf7bbcc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8cf7bbcc

Branch: refs/heads/master
Commit: 8cf7bbcc7643a8b258b9c36e308bc56d2d24cdf0
Parents: df406eb 84ad923
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Apr 21 16:14:35 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Apr 21 16:14:35 2016 +0100

----------------------------------------------------------------------
 .../BrooklynComponentTemplateResolver.java      |  12 +++++++---
 .../service/UrlServiceSpecResolver.java         |   4 +++-
 .../camp/brooklyn/ReferencedYamlTest.java       |  22 +++++++++++++++++++
 utils/common/dependencies/osgi/entities/pom.xml |   2 +-
 .../main/resources/yaml-ref-osgi-entity.yaml    |  21 ++++++++++++++++++
 .../dependencies/osgi/more-entities-v1/pom.xml  |   2 +-
 .../osgi/more-entities-v2-evil-twin/pom.xml     |   2 +-
 .../dependencies/osgi/more-entities-v2/pom.xml  |   2 +-
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 14649 -> 0 bytes
 .../osgi/brooklyn-test-osgi-entities.jar        | Bin 14454 -> 15301 bytes
 10 files changed, 59 insertions(+), 8 deletions(-)
----------------------------------------------------------------------