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

change validateNoSchema to validateNoScheme #21607

Merged

Conversation

allencloud
Copy link
Contributor

validateNoSchema has a typo in func name.
It should be validateNoScheme.

@mlaventure
Copy link
Contributor

vendor is a legitimate error, userns actually passed but CI got stuck afterwards.

@icecrime icecrime added the status/failing-ci Indicates that the PR in its current state fails the test suite label Mar 29, 2016
@vdemeester
Copy link
Member

@allencloud as @mlaventure said, the vendor build is failing because be do not change code in it without the same changes upstream (in the repo the changes are).

@thaJeztah
Copy link
Member

ping @allencloud can you update your PR and revert the changes in the vendor/ directory?

@allencloud
Copy link
Contributor Author

@thaJeztah
revert the changes in the vendor/ directory?
Sorry, Actually I do not understand this.
Since I do not change thing in vendor.
As well I can not follow the vendor build's failing.

@thaJeztah
Copy link
Member

@allencloud you made a change in vendor/src/github.com/docker/distribution/registry/api/v2/urls.go, since that file is vendored (copied) from another repository, you shouldn't change those files; your change is here; https://github.com/docker/docker/pull/21607/files#diff-9560ef2430be0af7ce734cd21bdcc2ccR17

If you change that back, the "vendor" check will no longer fail

2.change schema into scheme in docs and some annotations.

Signed-off-by: allencloud <allen.sun@daocloud.io>
@allencloud
Copy link
Contributor Author

@thaJeztah
Thanks a lot. I forgot that I also fixed some typos in this pr.
I have changed that.

@allencloud allencloud force-pushed the change-validateNoSchema-to-validateNoScheme branch from 4bc9d10 to 28d3c22 Compare March 31, 2016 04:30
@thaJeztah thaJeztah added status/2-code-review and removed status/1-design-review status/failing-ci Indicates that the PR in its current state fails the test suite labels Mar 31, 2016
@thaJeztah
Copy link
Member

thanks! LGTM

@vdemeester
Copy link
Member

LGTM 🐮
(experimental failure unrelated, merging)

@vdemeester vdemeester merged commit e6f2429 into moby:master Mar 31, 2016
@allencloud allencloud deleted the change-validateNoSchema-to-validateNoScheme branch May 10, 2016 00:12
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.

None yet

7 participants