mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-19 00:42:29 +00:00
9804168ca9
Integration test of the 51 commits that landed on upstream master after this branch was built. Four conflicts, all from edits to the same lines: perl-XCAT/xCAT/BootUtils.pm: both sides add a new sub at the end of the file. Master adds expand_node_template, this branch adds grub2_kernel_commands and grub2_image_provides. All three are kept. xCAT/xCAT.spec and xCATsn/xCATsn.spec: master wraps the chrony and dhcpd requirements in a suse_version test, and its %endif lands on the line this branch uses for radvd. The requirement stays outside the test, because an openSUSE management node writes radvd.conf too. xCAT-server/xCAT-server.spec: master's openSUSE requirement list is a superset of this branch's, so master's is taken whole. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>