Skip to content
This repository has been archived by the owner on Jul 9, 2020. It is now read-only.

Fixes #22139 - resolved atomic ostree conflict #479

Merged
merged 1 commit into from Oct 8, 2018

Conversation

lzap
Copy link
Member

@lzap lzap commented May 17, 2018

This resolves name clash, for more info see the issue.

@theforeman-bot
Copy link
Member

@lzap, the Redmine ticket used is for a different project than the one associated with this GitHub repository. Please either:

If changing the ticket number used, remember to update the PR title and the commit message (using git commit --amend).


This message was auto-generated by Foreman's prprocessor

Copy link
Member

@dLobatog dLobatog left a comment

Choose a reason for hiding this comment

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

Sorry, ran into http://projects.theforeman.org/issues/23801 when testing this..

@lzap
Copy link
Member Author

lzap commented Jun 6, 2018

NP, thanks. You can still use non-CDN repositories. Let's just wait.

@mmoll
Copy link
Contributor

mmoll commented Oct 7, 2018

what's the status here?

@lzap
Copy link
Member Author

lzap commented Oct 8, 2018

Ready for review.

@mmoll mmoll merged commit 0f17c81 into theforeman:develop Oct 8, 2018
@mmoll
Copy link
Contributor

mmoll commented Oct 8, 2018

merged, díky @lzap!

@lzap lzap deleted the atomic-remote-22139 branch October 10, 2018 13:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants