cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed git conflict with double para

Browse source
This commit is contained in:
Sandra Wills 2015-10-08 21:44:50 -04:00
parent f24fbb04c9
commit 84240c9f28
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docsite/rst/intro_inventory.rst
View file

@ -69,11 +69,7 @@ You can also select the connection type and user on a per host basis::
.. note::
<<<<<<< HEAD
Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
=======
Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
>>>>>>> 9d27412... note modified a bit, then reviewed/approved by jmartin
You can also select the connection type and user on a per host basis: