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

Pre-rebase fixes #19200

Merged
merged 5 commits into from
Apr 3, 2018
Merged

Pre-rebase fixes #19200

merged 5 commits into from
Apr 3, 2018

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Apr 3, 2018

Picks from #19137 that can merge before the rebase

liggitt added 5 commits April 3, 2018 11:16
Added:
github.com/openshift/origin/vendor/k8s.io/api/core/v1

Removed:
github.com/openshift/origin/vendor/k8s.io/kubernetes/third_party/forked/etcd221/pkg/fileutil
github.com/openshift/origin/vendor/k8s.io/kubernetes/third_party/forked/etcd237/pkg/fileutil
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2018
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 3, 2018
@liggitt
Copy link
Contributor Author

liggitt commented Apr 3, 2018

/assign @deads2k

@liggitt liggitt mentioned this pull request Apr 3, 2018
51 tasks
@deads2k
Copy link
Contributor

deads2k commented Apr 3, 2018

/retest

@deads2k
Copy link
Contributor

deads2k commented Apr 3, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit f7fe3b5 into openshift:master Apr 3, 2018
@liggitt liggitt deleted the prebase branch April 7, 2018 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants