Skip to content

Bug 1585114 - Remove ReplicationControllerDummy from other resources list #335

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
Merged
merged 1 commit into from
Jun 1, 2018
Merged

Bug 1585114 - Remove ReplicationControllerDummy from other resources list #335

merged 1 commit into from
Jun 1, 2018

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Jun 1, 2018

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 1, 2018
@rhamilto
Copy link
Member

rhamilto commented Jun 1, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 1, 2018
@rhamilto rhamilto merged commit 556cdc9 into openshift:master Jun 1, 2018
@spadgett spadgett deleted the rc-dummy branch June 11, 2018 14:09
@spadgett
Copy link
Member Author

/cherrypick enterprise-3.9

@openshift-cherrypick-robot
Copy link

@spadgett: #335 failed to apply on top of branch "enterprise-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	dist/origin-web-common-services.js
M	dist/origin-web-common.js
M	dist/origin-web-common.min.js
Falling back to patching base and 3-way merge...
Auto-merging dist/origin-web-common.min.js
CONFLICT (content): Merge conflict in dist/origin-web-common.min.js
Auto-merging dist/origin-web-common.js
CONFLICT (content): Merge conflict in dist/origin-web-common.js
Auto-merging dist/origin-web-common-services.js
Patch failed at 0001 Remove ReplicationControllerDummy from other resources list

In response to this:

/cherrypick enterprise-3.9

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.

@spadgett spadgett mentioned this pull request Jun 11, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rhamilto rhamilto

Labels
lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@spadgett @rhamilto @openshift-cherrypick-robot @openshift-ci-robot