ENT-9980: Properly handle promise locking with edit line (3.24.x)#5827
Merged
Conversation
This file requires the definition of the enum `PromiseResult`. Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit eb5e2b2)
This file requires the definition of the enum `PromiseResult`. Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit 441c4e7)
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit 7fee030)
Fixed bug causing rendered files can result in erroneously empty files as a result of promise locking. Ticket: ENT-9980 Changelog: Commit Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit c947544)
Contributor
Author
|
@cf-bottom Jenkins please :) |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/12225/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12225/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Back-ported from #5815