Revert FATE#320342 and FATE#317775 #242
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
but then we have to somehow merge it from CASP branch not? and does not this revert break that merge and we need do double revert? |
|
@jreidinger I don't expect this change to be merged from CASP (and even I don't want it). This feature should be only in CASP and SP3 as it's related to the installation. On the other hand, I could just create another PR that includes those changes using simply a patch and avoiding the revert command. |
|
ok, so LGTM |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've reverted changes for FATE#320342 and FATE#317775 as they won't be present in SLE 12 SP2 and, moreover, it introduces a bug (that to be fixed needs to update yast-autoinstallation).
A
git revert -m 1 a29db9bcould do the trick (you'll need to un-revert the changelog/version changes) but I've preferred to revert commit by commit to make revision easier (I'll squash all of them when merging).