search

yast / yast-yast2

YaST module yast2
http://en.opensuse.org/Portal:YaST
GNU General Public License v2.0
54 stars 44 forks source link

Merge SLE-15-SP5 Branch and Revert Restoring DnsServerAPI.pm #1288

Closed shundhammer closed 1 year ago

shundhammer commented 1 year ago

This is for master.

Bugzilla

https://bugzilla.suse.com/show_bug.cgi?id=1208833

Trello

https://trello.com/c/s0A0v2gw/

Problem

PR #1287 reverted a recent change that dropped DnsServerAPI.pm in YaST:Head which at that time had gone to both SLE-15-SP5 and Factory, which caused build failures in SLE-15-SP5 for yast-dns-server and yast-http-server.

Merging that SLE-15-SP5 branch back into master now restored that file again, but for both SLE-15-SP5 and master where dropping it was intentional.

Fix

This PR merges SLE-15-SP5 back into master and reverts that revert, so we can continue to merge SLE-15-SP5 back into master whenever there are fixes that need to go to both.

In effect, this is a complicated NOP, but we can merge the branch into master in the future whenever we need.

Related PR

1287

coveralls commented 1 year ago

Coverage Status

Coverage: 41.744%. Remained the same when pulling e0296bf82396e0fd6a98450fc18be00fadc24656 on huha-revert-restore into e1b44ea5d8ee6ab266f46f9c2a1469488927bf44 on master.

yast-bot commented 1 year ago

:heavy_check_mark: Public Jenkins job #400 successfully finished :heavy_check_mark: Created OBS submit request #1069653