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.

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

Win lineinfix fix #36888

Merged
merged 3 commits into from
Mar 6, 2018
Merged

Conversation

jborean93
Copy link
Contributor

SUMMARY

Backport of #35100

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

win_lineinfile

ANSIBLE VERSION
2.5

nwsparks and others added 2 commits March 1, 2018 13:53
* win_lineinfile: fix ansible#33858. Removed conversion from \r\n

* win_lineinfile: added test for ansible#33858

* win_lineinfile: added documentation and more tests for change

* win_lineinfile: fixed wrong hash in testing

(cherry picked from commit e15a903)
@jborean93 jborean93 mentioned this pull request Mar 1, 2018
@ansibot
Copy link
Contributor

ansibot commented Mar 1, 2018

@ansibot ansibot added affects_2.5 This issue/PR affects Ansible v2.5 backport This PR does not target the devel branch. bugfix_pull_request core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests. windows Windows community labels Mar 1, 2018
@jborean93 jborean93 removed the needs_triage Needs a first human triage before being processed. label Mar 1, 2018
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 2, 2018
@@ -0,0 +1,2 @@
bugfixes:
- win_lineinfil - fixed issue where \r and \n as a string was converted to newline (https://github.com/ansible/ansible/pull/35100)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/lineinfil/lineinfile/

@nitzmahone nitzmahone merged commit f0a808e into ansible:stable-2.5 Mar 6, 2018
@jborean93 jborean93 deleted the win_lineinfix-fix branch March 6, 2018 21:05
@ansible ansible locked and limited conversation to collaborators Apr 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.5 This issue/PR affects Ansible v2.5 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests. windows Windows community
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants