mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
fixed git conflict with double para
This commit is contained in:
parent
f24fbb04c9
commit
84240c9f28
1 changed files with 0 additions and 4 deletions
|
@ -69,11 +69,7 @@ You can also select the connection type and user on a per host basis::
|
||||||
|
|
||||||
.. note::
|
.. 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.
|
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:
|
You can also select the connection type and user on a per host basis:
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue