Merge the following changes from the internal Cisco repository:#5
Open
TonySamuels wants to merge 1 commit intocisco:masterfrom
Open
Merge the following changes from the internal Cisco repository:#5TonySamuels wants to merge 1 commit intocisco:masterfrom
TonySamuels wants to merge 1 commit intocisco:masterfrom
Conversation
- Make tar -> tar.gz enhancement backwards compatible - Allow propagating from multiple changed dependencies - Add channels
Contributor
|
Do you need some access to commit in here? I can probably elevate you. Btw, any chances of getting individual commits rather than a large blob? |
Author
|
I don't believe I have access, but am happy to do it this way anyway. We've caught a few other changes we want made at the same time, I'll see about redoing this merge with commits once those are complete, but it depends on how much work it would be to strip out any internal files. I expect it won't be a problem. |
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
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.
Note that between clippy seeming not to have been run on all code and the automatic update tool to edition 2018, there are several parts of the diffs with no functional changes.
*Channels are a
lalfeature equivalent togit's branches. The idea behind it is that some dependencies may have multiple branches (e.g. for specific versions, or for different operating systems) and the build target may depend on a specific branch. By adding channels, a new version can be pushed for the dependency for each branch, and they will not conflict. The exact mapping between a channel andgitbranches (or any other method) is left to the user and tools that work withlal.