Skip to content

bundle edit_line converge fixups, converge_prepend addition/master#1855

Merged
nickanderson merged 5 commits intocfengine:masterfrom
nickanderson:converge_prepend/master
Oct 29, 2020
Merged

bundle edit_line converge fixups, converge_prepend addition/master#1855
nickanderson merged 5 commits intocfengine:masterfrom
nickanderson:converge_prepend/master

Conversation

@nickanderson
Copy link
Copy Markdown
Member

@nickanderson nickanderson commented Oct 28, 2020

Superceeds #1853

@nickanderson nickanderson force-pushed the converge_prepend/master branch from 0530d7f to fd51e58 Compare October 28, 2020 18:10
@tzz
Copy link
Copy Markdown
Contributor

tzz commented Oct 29, 2020

YES

@nickanderson
Copy link
Copy Markdown
Member Author

@cf-bottom can you please have Jenkins build this since Travis is so epically slow.

@cf-bottom
Copy link
Copy Markdown

Comment thread tests/acceptance/lib/files/edit_line_converge.cf Outdated
Comment thread tests/acceptance/lib/files/edit_line_converge_prepend.cf Outdated
Comment thread tests/acceptance/lib/files/edit_line_converge_prepend.cf Outdated
Comment thread lib/files.cf
@nickanderson
Copy link
Copy Markdown
Member Author

@cf-bottom please run through Jenkins, again.

@cf-bottom
Copy link
Copy Markdown

@nickanderson
Copy link
Copy Markdown
Member Author

Alright, @cf-bottom, please run this through Jenkins one more time.

@nickanderson nickanderson added the WIP Work in Progress label Oct 29, 2020
@cf-bottom
Copy link
Copy Markdown

@nickanderson nickanderson changed the title converge_prepend/master bundle edit_line converge fixups, converge_prepend addition/master Oct 29, 2020
@nickanderson
Copy link
Copy Markdown
Member Author

Now that's the green I was looking for.

tzz and others added 2 commits October 29, 2020 12:50
Ticket: CFE-3483

Changelog: Added bundle edit_line converge_prepend with same behavior as bundle
edit_line converge, but inserting at start of content.
@nickanderson nickanderson force-pushed the converge_prepend/master branch from 58857f2 to 22a4b87 Compare October 29, 2020 17:56
tzz and others added 3 commits October 29, 2020 13:00
In my testing with 3.16, the deletion doesn't work today, so `converge` is not functioning properly.

(cherry picked from commit fae4505)

Ticket: CFE-3482
Changelog: Title
Ticket: CFE-3482
Changelog: None
@nickanderson nickanderson force-pushed the converge_prepend/master branch from 22a4b87 to 845bcc9 Compare October 29, 2020 18:01
@nickanderson nickanderson merged commit 6193365 into cfengine:master Oct 29, 2020
@nickanderson nickanderson removed the WIP Work in Progress label Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants