Enables other stub configurations to be merged in after the enable_ss… #85
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
…h_in_cf stub Currently all stubs merging in after this stub will be butchered for the client fields. I added extra merge statements in to make sure other properties besides the clients can get merged in as well. Please look over this and decide if these extra merges are necessary.
|
Hey weymanf! Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you've already signed the CLA. |
1 similar comment
|
Hey weymanf! Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you've already signed the CLA. |
|
Thanks, @weymanf! We'll prioritize this for the Diego team to evaluate ASAP. Best, |
jfmyers9
pushed a commit
that referenced
this pull request
Mar 2, 2016
Submodule src/github.com/pkg/sftp cbc2879..e84cc8c: > Merge pull request #85 from pkg/rootdir > Merge pull request #81 from pkg/server-option > Merge pull request #80 from pkg/functional-options > Merge pull request #78 from pkg/server-readonly > Merge pull request #79 from pkg/readme-badges > Merge pull request #77 from pkg/namedreturns > Merge pull request #75 from pkg/golint > Merge pull request #73 from mdlayher/golint > Merge pull request #74 from LiterallyElvis/master > Merge pull request #72 from mdlayher/master > Merge pull request #70 from pkg/fixedbugs/69 > Merge pull request #67 from mdlayher/master > Merge pull request #64 from pkg/fixedbugs/28 > Merge pull request #63 from pkg/fixedbugs/5 > Merge pull request #61 from pkg/add-travis > Merge pull request #62 from xiu/bugfix/35-cant-remove-directories-on-servu > Merge pull request #58 from sykesm/client-realpath > Merge pull request #60 from pkg/fixedbugs/57 > updated contribution guidelines Signed-off-by: James Myers <jmyers@pivotal.io>
robertjsullivan
added a commit
that referenced
this pull request
Mar 12, 2020
Submodule src/github.com/square/certstrap b61237589..bd8b02aa8: > Bump Go to 1.13 > Merge pull request #85 from square/mbyczkowski/better-versioning > Merge pull request #81 from square/mbyczkowski/option-for-output > Merge pull request #80 from square/dependabot/go_modules/github.com/urfave/cli-1.21.0 > Merge pull request #79 from square/mbyczkowski/godoc-badge > Merge pull request #71 from julianedwards/extractname > Merge pull request #77 from julianedwards/newtemplates > Merge pull request #73 from defer/ft-text-fixes > Merge pull request #69 from square/cs/dockerfile > Merge pull request #68 from square/cs/update-cli > Merge pull request #67 from square/cs/mod Co-authored-by: Edwin Xie <exie@pivotal.io>
tas-runtime-bot
added a commit
that referenced
this pull request
Mar 13, 2024
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.
Lets stubs after enable_diego_ssh_stub to be merged in and not get butchered.
Currently all stubs merging in after this stub will be butchered for the client fields.
I added extra merge statements in to make sure other properties besides the clients can get merged in as well.
Please look over this and decide if these extra merges are necessary.