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 fork bump #19888

Merged
merged 2 commits into from
May 31, 2018
Merged

update fork bump #19888

merged 2 commits into from
May 31, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented May 30, 2018

This pull updates the definition of the runc fork and also the source-to-image level which changed concurrently.

/assign @adambkaplan @vikaschoudhary16 @sjenning

@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 30, 2018
@adambkaplan
Copy link
Contributor

/lgtm for s2i changes

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@deads2k
Copy link
Contributor Author

deads2k commented May 30, 2018

/retest

@deads2k
Copy link
Contributor Author

deads2k commented May 30, 2018

Looks like we've developed a race in cluster up

I0530 18:29:07.601586    3502 interface.go:41] Finished installing "centos-imagestreams" "sample-templates" "openshift-service-catalog" "openshift-image-registry" "openshift-router" "persistent-volumes" "openshift-template-service-broker" "openshift-web-console-operator"
Error: Operation cannot be fulfilled on openshiftwebconsoleconfigs.webconsole.operator.openshift.io "instance": the object has been modified; please apply your changes to the latest version and try again

@deads2k
Copy link
Contributor Author

deads2k commented May 30, 2018

/retest

@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label May 30, 2018
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit f9d04bc into openshift:master May 31, 2018
@adambkaplan adambkaplan mentioned this pull request May 31, 2018
@deads2k deads2k deleted the bump-02-runc branch July 3, 2018 17:48
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants