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

UPSTREAM: 65189: revert: fix paths w shortcuts when copying from pods" #20075

Merged
merged 1 commit into from
Jun 22, 2018
Merged

UPSTREAM: 65189: revert: fix paths w shortcuts when copying from pods" #20075

merged 1 commit into from
Jun 22, 2018

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Jun 22, 2018

This reverts commit 6359a95.

The upstream master PR did not merge because of some issues found, and the 1.11 PR was reverted. We don't want this to go into 3.10 as is

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 22, 2018
@liggitt
Copy link
Contributor Author

liggitt commented Jun 22, 2018

the upstream PR needed changes and the 1.11 pick got reverted. reverting here to remove from the 3.10 branch

@liggitt
Copy link
Contributor Author

liggitt commented Jun 22, 2018

cc @juanvallejo @deads2k

Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, soltysh

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

@liggitt
Copy link
Contributor Author

liggitt commented Jun 22, 2018

clean revert, units are green, merging to get the bot to push this out for 3.10

@liggitt liggitt merged commit ba21ba0 into openshift:master Jun 22, 2018
@liggitt liggitt deleted the revert-cp branch June 28, 2018 19:12
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants