Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c6dc664b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c6dc664b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c6dc664b Branch: refs/heads/master Commit: c6dc664b476f6e96e67e16a0e8bde1a2990b205d Parents: 9632405 ea1d6cb Author: Hadrian Zbarcea <[email protected]> Authored: Mon Jun 29 21:41:58 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Mon Jun 29 21:41:58 2015 -0400 ---------------------------------------------------------------------- .../entity/basic/AbstractApplication.java | 18 +++ .../basic/AbstractApplicationLegacyTest.java | 75 ++++++++---- .../test/entity/TestApplicationImpl.java | 2 +- ...lusterDatabaseExampleAppIntegrationTest.java | 8 +- .../proxy/nginx/NginxRebindIntegrationTest.java | 24 ++-- .../nginx/NginxUrlMappingIntegrationTest.java | 35 +++--- .../io/brooklyn/camp/brooklyn/AppYamlTest.java | 119 +++++++++++++++++++ usage/downstream-parent/pom.xml | 2 +- .../BrooklynEntityMirrorIntegrationTest.java | 4 + .../vanilla-software-with-child-blueprint.yaml | 18 ++- 10 files changed, 245 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c6dc664b/usage/downstream-parent/pom.xml ----------------------------------------------------------------------
