Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp remove conflicting line for making it possible to have a clean backport of security fixes in 7189 #7275

Merged

Conversation

deneb-alpha
Copy link
Contributor

@deneb-alpha deneb-alpha commented Jul 17, 2023

What does this PR change?

Remove conflicting line for making it possible to have a clean backport of security fixes in #7189.
This change will be reverted after the backport

GUI diff

No difference.

  • DONE

Documentation

Test coverage

Links

Relates: #7189
Relates: https://github.com/SUSE/spacewalk/issues/21856

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

@github-actions
Copy link
Contributor

Suggested tests to cover this Pull Request
  • srv_menu
  • srv_check_channels_page
  • srv_power_management_redfish
  • srv_create_repository
  • min_move_from_and_to_proxy
  • srv_cobbler_buildiso
  • srv_cobbler_sync
  • srv_cobbler_profile
  • srv_distro_cobbler
  • minkvm_guests
  • proxy_retail_pxeboot_and_mass_import
  • min_retracted_patches
  • srv_push_package
  • proxy_as_pod_basic_tests
  • srv_cobbler_distro
  • srv_power_management
  • min_timezone
  • srv_virtual_host_manager
  • allcli_update_activationkeys
  • srv_check_sync_source_packages

Copy link
Member

@juliogonzalez juliogonzalez left a comment

Choose a reason for hiding this comment

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

LGTM. Remember to merge this before #7189, and then to restore this line.

@deneb-alpha deneb-alpha merged commit 6ac9ace into uyuni-project:master Jul 17, 2023
10 of 17 checks passed
@deneb-alpha deneb-alpha changed the title Remove conflicting line for making it possible to have a clean backport of security fixes in 7189 Temp remove conflicting line for making it possible to have a clean backport of security fixes in 7189 Jul 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants