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

UPSTREAM: <drop>: updated files affecting codegen #31

Merged

Conversation

deads2k
Copy link

@deads2k deads2k commented Jun 9, 2017

These files have to be updated in order to generate code, but we can't bring them back through upstream picks. This took a while to sort out....

@deads2k
Copy link
Author

deads2k commented Jun 9, 2017

I managed to find this is in 546b45c and this is a partial pick (the bits that aren't go code)

@liggitt
Copy link

liggitt commented Jun 11, 2017

Are there not generated changes accompanying these?

@sttts
Copy link

sttts commented Jun 12, 2017

lgtm

@deads2k
Copy link
Author

deads2k commented Jun 12, 2017

Are there not generated changes accompanying these?

The generated changes are in an UPSTREAM: patch for openshift which goes into openshift first and is picked back into the fork to ensure clean application of patches.

@deads2k deads2k merged commit 0a10b3a into openshift:openshift-1.6-20170501 Jun 12, 2017
@deads2k deads2k deleted the fix-upstream-codegen branch August 3, 2017 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants