Rebase dev into dr_registry_user_policy#1394
Closed
dwelch2344 wants to merge 61 commits into
Closed
Conversation
…ant to set MITRE as the default for now? We will bring this up to AWG.
…ant to set MITRE as the default for now? We will bring this up to AWG.
dwelch2344
force-pushed
the
dtw/rebase_dev
branch
from
5cd21fa to
5e21d78
Compare
Contributor
Author
|
Okay, this is looking like a much cleaner rebase. I've never quite had false positives whitespace, so I ended up sorting out using the github UI via this merge. Figure it'll all get squashed but lmk if you want a specific cleanup. |
david-rocca
force-pushed
the
dr_registry_user_policy
branch
from
69bc7a4 to
8891870
Compare
Collaborator
|
Hey @dwelch2344 I pulled your changes in directly to my branch and did the rebase over there, thanks for prepping this. |
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
3 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.
As discussed in AWG, #1392 hasn't been rebased against dev in a while. Attempted to do that (with moderately high confidence I didn't stomp anything on the way)
(cleaner rebase over #1393)