Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/cd6242aa Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/cd6242aa Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/cd6242aa Branch: refs/heads/master Commit: cd6242aadec41a83a45c84c0945c8cdd76ebe1ec Parents: 892400e 7402753 Author: Alex Heneveld <[email protected]> Authored: Tue Nov 14 12:33:05 2017 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Nov 14 12:33:05 2017 +0000 ---------------------------------------------------------------------- guide/blueprints/_elect-primary-policies.md | 146 +++++++++++++++++++++++ guide/blueprints/policies.md | 19 ++- 2 files changed, 163 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
