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 2015/12/17 12:59:55 UTC

[7/7] incubator-brooklyn git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-brooklyn

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-brooklyn


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/085e1cc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/085e1cc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/085e1cc5

Branch: refs/heads/master
Commit: 085e1cc5b87c78a3361e8a4cd1f4df19a766fe78
Parents: 7f3c4d7 85ff6af
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Dec 17 11:59:35 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Dec 17 11:59:35 2015 +0000

----------------------------------------------------------------------
 docs/guide/dev/env/ide/eclipse.include.md                          | 2 +-
 .../yaml/example_yaml/simple-appserver-with-location-byon.yaml     | 2 +-
 usage/cli/src/main/resources/brooklyn/default.catalog.bom          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------