Skip to content

ENT-9980: Properly handle promise locking with edit line#5815

Merged
larsewi merged 4 commits into
cfengine:masterfrom
larsewi:render
Jun 13, 2025
Merged

ENT-9980: Properly handle promise locking with edit line#5815
larsewi merged 4 commits into
cfengine:masterfrom
larsewi:render

Conversation

@larsewi

@larsewi larsewi commented May 27, 2025

Copy link
Copy Markdown
Contributor
  • verify_files.c: Added missing include for cf3.defs.h
  • files_edit.c: Added missing include for cf3.defs.h
  • verify_files.c: Removed trailing white space
  • Properly handle promise locking with edit line

Back-ported to:

@larsewi larsewi force-pushed the render branch 4 times, most recently from 5a945a1 to dd79a5a Compare May 28, 2025 09:43
@cf-bottom

Copy link
Copy Markdown

Thank you for submitting a pull request! Maybe @craigcomstock can review this?

@larsewi larsewi force-pushed the render branch 2 times, most recently from a88a0df to 368096e Compare May 28, 2025 12:37
larsewi added 3 commits May 28, 2025 16:38
This file requires the definition of the enum `PromiseResult`.

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
This file requires the definition of the enum `PromiseResult`.

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
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>
@larsewi

larsewi commented May 30, 2025

Copy link
Copy Markdown
Contributor Author

@cf-bottom Jenkins please :)

@larsewi larsewi marked this pull request as ready for review May 30, 2025 15:07
@cfengine cfengine deleted a comment from cf-bottom Jun 2, 2025

@craigcomstock craigcomstock left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Look good to me.

@cfengine cfengine deleted a comment from cf-bottom Jun 6, 2025
@cf-bottom

Copy link
Copy Markdown

@larsewi

larsewi commented Jun 12, 2025

Copy link
Copy Markdown
Contributor Author

@cf-bottom Jenkins please :)

@cf-bottom

Copy link
Copy Markdown

@larsewi larsewi merged commit 0f662bf into cfengine:master Jun 13, 2025
12 checks passed
@larsewi larsewi deleted the render branch July 3, 2025 09:20
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