Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

junos_config documentation missing "update" choice #51299

Merged
merged 2 commits into from
Jan 30, 2019
Merged

junos_config documentation missing "update" choice #51299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87ea63
Update junos_config.py
crab86 Jan 24, 2019
37f289d
Fixup Update junos_config.py
samccann Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/ansible/modules/network/junos/junos_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,14 @@
it with the loaded configuration.
C(replace) substitutes each hierarchy level in the loaded configuration
for the corresponding level.
C(update) is similar to the override option. The new configuration completely
replaces the existing configuration. The difference comes when the configuration
is later committed. This option performs a 'diff' between the new candidate
configuration and the existing committed configuration. It then only notifies
system processes responsible for the changed portions of the configuration, and
only marks the actual configuration changes as 'changed'.
default: merge
choices: ['merge', 'override', 'replace']
choices: ['merge', 'override', 'replace', 'update']
version_added: "2.3"
confirm_commit:
description:
Expand Down
1 change: 0 additions & 1 deletion test/sanity/validate-modules/ignore.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,6 @@ lib/ansible/modules/network/ironware/ironware_command.py E323
lib/ansible/modules/network/ironware/ironware_config.py E323
lib/ansible/modules/network/ironware/ironware_facts.py E323
lib/ansible/modules/network/junos/junos_command.py E324
lib/ansible/modules/network/junos/junos_config.py E326
lib/ansible/modules/network/junos/junos_interface.py E324
lib/ansible/modules/network/junos/junos_linkagg.py E324
lib/ansible/modules/network/junos/junos_logging.py E322
Expand Down