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.

Sign up for GitHub

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

Jump to bottom

Update glide again #17962

Merged
merged 4 commits into from
Jan 3, 2018
Merged

Update glide again #17962

merged 4 commits into from
Jan 3, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jan 2, 2018

This:

  1. creates and uses the runc fork @sjenning
  2. switches the glide.yaml to use master of api and client-go
  3. adds comments to glide.yaml to provide blame-type information for conflicts
  4. makes minimal changes to bring in new API fields.

/assign simo5
/assign bparees

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 2, 2018
@openshift-merge-robot openshift-merge-robot added needs-api-review vendor-update Touching vendor dir or related files labels Jan 2, 2018
bparees
bparees reviewed Jan 2, 2018
View reviewed changes
glide.yaml
version: master

# forks third
# master
Copy link
Contributor

Choose a reason for hiding this comment

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

not sure what "master" means here?

Copy link
Contributor

Choose a reason for hiding this comment

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

i guess it means the team. i read it as a branch name. might confuse others.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure what "master" means here?

sig-master ?

Copy link
Contributor

Choose a reason for hiding this comment

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

that'd definitely alleviate the potential for confusion. "owner: master" could work too.

@simo5
Copy link
Contributor

simo5 commented Jan 2, 2018

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

simo5
simo5 approved these changes Jan 2, 2018
View reviewed changes
Copy link
Contributor

@simo5 simo5 left a comment

Choose a reason for hiding this comment

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

It's consistent with the changes I was attempting in my PR to pull in api stuff.

@simo5 simo5 mentioned this pull request Jan 2, 2018
Merged
@simo5
Copy link
Contributor

simo5 commented Jan 2, 2018

/retest

1 similar comment
@simo5
Copy link
Contributor

simo5 commented Jan 3, 2018

/retest

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 3, 2018 •
edited
Loading

@deads2k: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_image_ecosystem 4503dca link /test extended_image_ecosystem
ci/openshift-jenkins/integration 4503dca link /test integration

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@deads2k
Copy link
Contributor Author

deads2k commented Jan 3, 2018

This was green, the only merged pull since is a doc change, and it unblocks at least two people right before dcut. Merging.

@deads2k deads2k merged commit dc73150 into openshift:master Jan 3, 2018
@deads2k deads2k deleted the glide-02 branch January 24, 2018 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bparees bparees bparees left review comments

@simo5 simo5 simo5 approved these changes

@adelton adelton Awaiting requested review from adelton

@danwinship danwinship Awaiting requested review from danwinship

@dcbw dcbw Awaiting requested review from dcbw

@enj enj Awaiting requested review from enj

@gabemontero gabemontero Awaiting requested review from gabemontero

@liggitt liggitt Awaiting requested review from liggitt

@mfojtik mfojtik Awaiting requested review from mfojtik

@miminar miminar Awaiting requested review from miminar

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@soltysh soltysh Awaiting requested review from soltysh

Assignees

@bparees bparees

@simo5 simo5

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. needs-api-review size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@deads2k @simo5 @openshift-ci-robot @openshift-merge-robot @bparees