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

update bmo 20190708 #36

Merged
merged 3 commits into from
Jul 10, 2019
Merged

update bmo 20190708 #36

merged 3 commits into from
Jul 10, 2019

Conversation

dhellmann
Copy link

Update to the version of the baremetal-operator that completes the work to rename machineRef to consumerRef.

dhellmann and others added 3 commits July 5, 2019 16:00
This updates the vendored copy of baremetal-operator to remove the
machineRef field.
update baremetal-operator to remove machineRef
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 8, 2019
@dhellmann
Copy link
Author

/cc @russellb

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2019
@hardys
Copy link

hardys commented Jul 10, 2019

I think some recent fixes from @zaneb landed so should we update this to include those?

@dhellmann @russellb I'd like to rebase kni-installer again this week to pick up openshift/installer#1941 so it'd be good to ensure all the openshift forks are updated before we do that.

@dhellmann
Copy link
Author

I think some recent fixes from @zaneb landed so should we update this to include those?

@dhellmann @russellb I'd like to rebase kni-installer again this week to pick up openshift/installer#1941 so it'd be good to ensure all the openshift forks are updated before we do that.

As a general process thing, I've been creating these date-based PRs so we can just take them incrementally. So I could close this one and open a new one with the full content, or we could take this one and I could open another with the new delta. Let me know which you prefer.

@russellb
Copy link
Member

i'm fine landing this, and then a follow-up PR. This shouldn't cause a problem AFAIK ...

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, russellb

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 e41f0c0 into openshift:master Jul 10, 2019
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants