You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ji...@apache.org on 2014/12/22 19:39:41 UTC

[2/2] 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/d57521c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d57521c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d57521c5

Branch: refs/heads/master
Commit: d57521c5936fc6536c5cba43d37342577b1d04da
Parents: b20f45f c97eaae
Author: Jim Jagielski <ji...@gmail.com>
Authored: Mon Dec 22 13:39:19 2014 -0500
Committer: Jim Jagielski <ji...@gmail.com>
Committed: Mon Dec 22 13:39:19 2014 -0500

----------------------------------------------------------------------
 docs/_config.yml                   | 2 ++
 docs/_plugins/brooklyn_metadata.rb | 9 +++++++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------