Make Suse and Sles support 127.0.1.1#331
Closed
chengcheng-chcheng wants to merge 3 commits intocanonical:masterfrom
chengcheng-chcheng:sles-support-127011-branch
Closed
Make Suse and Sles support 127.0.1.1#331chengcheng-chcheng wants to merge 3 commits intocanonical:masterfrom chengcheng-chcheng:sles-support-127011-branch
chengcheng-chcheng wants to merge 3 commits intocanonical:masterfrom
chengcheng-chcheng:sles-support-127011-branch
Conversation
… IP was customized on suse and sles modify the nunittest to support 127.0.1.1 for sles and suse. modify the nunittest to support 127.0.1.1 for sles and suse.
blackboxsw
requested changes
Apr 27, 2020
Collaborator
There was a problem hiding this comment.
Thanks for the submission to improve cloud-init!
I think in your merge branch master commit something happened to inadvertently include all files in your working directory a1c6687
Please drop those unintended files from this PR if possible.
One way to refresh latest tip of master into your branch is this flow:
git checkout <your_branch>
# Fetch upstream cloud-init changes
ORIGIN=`git remote -v | grep canonical/cloud-init | awk '(NR == 1){print $1}'`
git fetch $ORIGIN
# Rebase <your_branch> on top of any upstream cloud-init changes that have landed
git rebase -i $ORIGIN/master
Collaborator
|
Closed in favor of #336 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Make Suse and Sles support 127.0.1.1
Same as ubuntu-debian as link below, make sles-suse also support 127.0.1.1
http://www.leonardoborda.com/blog/127-0-1-1-ubuntu-debian/
suse and sles support 127.0.1.1