Skip to content

Conversation

@larsewi
Copy link
Owner

@larsewi larsewi commented Feb 14, 2025

  • Add docs "merge_blocks" parameter
  • Added pytest for testing disabling of merging
  • Now parses the "merge_blocks" field
  • Now adds child block to patch if not empty after merging with parent
  • You can now disable the merging of specific tables

Ticket: CFE-4279
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Ticket: CFE-4279
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Ticket: CFE-4279
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Ticket: CFE-4279
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Ticket: CFE-4279
Changelog: Title
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@larsewi larsewi marked this pull request as ready for review February 14, 2025 13:00
@larsewi larsewi merged commit 45aa9e4 into master Feb 14, 2025
5 checks passed
@larsewi larsewi deleted the disable branch August 29, 2025 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants