Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Norman Proxy Support #218

Merged
merged 1 commit into from
Mar 20, 2020
Merged

Norman Proxy Support #218

merged 1 commit into from
Mar 20, 2020

Conversation

jordanjean
Copy link
Contributor

@jordanjean jordanjean commented Jan 7, 2020

This Pull Request introduces proxy support for the Rancher Norman API.

@rawmind0
Copy link
Contributor

rawmind0 commented Jan 7, 2020

Hi @jordanjean, have you modified directly the vendor file?? I think this change is not done at norman repo. The proper way to do it should be submit this PR at norman repo and then update module version here.

@jordanjean
Copy link
Contributor Author

jordanjean commented Jan 7, 2020

Hi @rawmind0, yes I opened a PR at the Norman repo (rancher/norman#329). Once it is merged, I could update the module version and remove the changes made to the vendor file.

@rawmind0
Copy link
Contributor

rawmind0 commented Jan 7, 2020

Cool, thanks.

@ghost ghost added size/S and removed size/XS labels Feb 6, 2020
@jordanjean jordanjean force-pushed the proxy-support branch 2 times, most recently from 90d4eba to c79630b Compare February 6, 2020 12:54
@jordanjean
Copy link
Contributor Author

Hi, the PR introducing proxy support for the Norman dependency is merged. I updated the module version here.

Copy link
Contributor

@rawmind0 rawmind0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jordanjean , you'd need to also update vendor files and include them in the PR, GO111MODULE=on go mod vendor

@ghost ghost added size/XXL and removed size/S labels Feb 19, 2020
@jordanjean
Copy link
Contributor Author

@rawmind0, vendor files updated.

@rawmind0
Copy link
Contributor

@jordanjean , could you please resolve conflicts??

@jordanjean
Copy link
Contributor Author

@rawmind0, for sure, branch rebased !

Copy link
Contributor

@rawmind0 rawmind0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jordanjean

LGTM

@rawmind0 rawmind0 merged commit 6d9d78b into rancher:master Mar 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants