DO-NOT-MERGE: sdn-base to 9.8-stable 46e2320 with only f5_openstack_agent directory #1429
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
For differences between sdn-base and 9.8-stable branch(commit 46e2320). Note: version in __init__.py is modified to be 5.0.0 here. So it is actually not the exact differences between the two branches. Meanwhile, it only includes the files from f5_openstack_agent directory. Other directories are ignored here for now. NOTE: This should never be merged into sdn-base branch. The sdn-base branch should never be touched/merged. sdn-base is at 14d8557. This should only server as the PR to download the patch file.
Niklaus-xie
force-pushed
the
sdn-base-2-9.8-stable-46e2320-exclude-dir
branch
from
6b70d66
to
354feca
Compare
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.
this PR provides the diff between sdn-base and 9.8-stable(46e2320).
this provides the possible patch to be used.
NOTE: this is not the exact diff because init.py still has 5.0.0.
This diff only includes the files from f5_openstack_agent directory,
other directories are not included into this PR.
NOTE: This should never be merged into sdn-base branch.
The sdn-base branch should never be touched/merged.
sdn-base is now at 14d8557.