Skip to content

Pin urllib3 to fix travis builds #287

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
Apr 25, 2019
Merged

Pin urllib3 to fix travis builds #287

merged 1 commit into from
Apr 25, 2019

Conversation

@fabianvf
Copy link
Member

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 25, 2019
@fabianvf
Copy link
Member Author

/cherrypick release-0.8
/cherrypick release-0.9

@fabianvf fabianvf merged commit 5d86bf5 into openshift:master Apr 25, 2019
@openshift-cherrypick-robot
Copy link

@fabianvf: once the present PR merges, I will cherry-pick it on top of release-0.8 in a new PR and assign it to you.

In response to this:

/cherrypick release-0.8
/cherrypick release-0.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.

@openshift-cherrypick-robot
Copy link

@fabianvf: #287 failed to apply on top of branch "release-0.8":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	requirements.txt
Falling back to patching base and 3-way merge...
Auto-merging requirements.txt
CONFLICT (content): Merge conflict in requirements.txt
Patch failed at 0001 Pin urllib3 to fix travis builds

In response to this:

/cherrypick release-0.8
/cherrypick release-0.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.

@fabianvf
Copy link
Member Author

/cherrypick release-0.9

fabianvf added a commit that referenced this pull request Apr 25, 2019
@fabianvf
Pin urllib3 to fix travis builds (#287)
8fdfd3a 
(cherry picked from commit 5d86bf5)
fabianvf added a commit that referenced this pull request Apr 25, 2019
@fabianvf
Pin urllib3 to fix travis builds (#287)
26b3c69 
(cherry picked from commit 5d86bf5)
willthames pushed a commit to willthames/openshift-restclient-python that referenced this pull request Nov 22, 2019
@fabianvf @willthames
Pin urllib3 to fix travis builds (openshift#287)
43495b2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fabianvf @openshift-cherrypick-robot @openshift-ci-robot