Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.apache.org
From: ahgittin <git@git.apache.org>
To: dev@brooklyn.incubator.apache.org
Reply-To: dev@brooklyn.incubator.apache.org
Message-ID: <git-pr-1143-incubator-brooklyn@git.apache.org>
Subject: [GitHub] incubator-brooklyn pull request: [WIP] clean up app spec
 unwrappin...
Content-Type: text/plain
Date: Wed, 13 Jan 2016 16:44:00 +0000 (UTC)

GitHub user ahgittin opened a pull request:

    https://github.com/apache/incubator-brooklyn/pull/1143

    [WIP] clean up app spec unwrapping

    builds on #1138 cleaning it up, and work towards setting the correct plan yaml on entity specs coming from catalog template items
    
    note this is WIP, as the test for the latter currently fails, and the former is untested, and i've not yet looked at example 4 -- but i wanted to put it out for early review given the attention on #1138

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ahgittin/incubator-brooklyn blueprint-for-app-spec

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-brooklyn/pull/1143.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1143
    
----
commit e3a16614055f83f68164d6cfe222668710a4f953
Author: Aled Sage <aled.sage@gmail.com>
Date:   2016-01-12T16:55:01Z

    YAML: don’t wrap sub-entities in BasicApplication
    
    Previously, any catalog item of type “template” would always be wrapped
    in a BasicApplication. This was being done in three places. The first
    is ok; the second two are bad:
    
    1. When deploying a top-level “template” from the catalog.
    2. When referring to a “template” catalog item in a member-spec (e.g.
       for a DynamicCluster)
    3. When referring to a “template” catalog item in brooklyn.children.

commit 09351a664665056b8a47a233f6eefdbc65769288
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date:   2016-01-13T11:28:03Z

    test (failing) for setting the plan yaml on a spec when it comes from a template registry item

commit c97ccaf94bcd94fadd61a19aaf87b94893e9a23e
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date:   2016-01-13T11:29:26Z

    This closes #1138

commit 9fac9c454f59821b37ade208bfcb581eba38009f
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date:   2016-01-13T16:40:06Z

    Merge branch 'master' into blueprint-for-app-spec
    
    Conflicts:
    	brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java -- tests added

commit b35188c684575eff3422f0acd06356c5dc824a94
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Date:   2016-01-13T16:40:24Z

    tidy up of entity/app unwrapping

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---