internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict.

Browse Source
This commit is contained in:
Michael DeHaan
2013-04-12 17:51:55 -04:00
parent 26819d707d
commit 9ed246e432
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docsite/latest/rst/playbooks.rst
View File

@@ -417,8 +417,6 @@ inside another.
play are going to get the same tasks. ('only_if' provides some
ability for hosts to conditionally skip tasks).
<<<<<<< HEAD:docsite/rst/playbooks.rst
=======
Roles
`````
@@ -480,7 +478,6 @@ Also, should you wish to parameterize roles, by adding variables, you can do so,
- { role: foo_app_instance, dir: '/opt/a', port: 5000 }
- { role: foo_app_instance, dir: '/opt/b', port: 5001 }
>>>>>>> Docs on parameterized roles, make document generation output less noisy:docsite/latest/rst/playbooks.rst
Executing A Playbook
````````````````````