Fix for #1405#1407
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: abrennan89 If they are not already assigned, you can assign the PR to them by writing The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@abrennan89: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
hm, this seems to include the commits that were merged in #1363 -- this PR should just include the commits that fix the issue, since the content has already been merged in. I think that will fix the merge conflict as well. |
|
Hi @samodell - yes apologies I just pinged you on Slack! I goofed and forgot to remove the branch etc before I added a new commit. Can you close or delete this PR and I will do this properly? Sorry for the inconvenience! |
|
no worries at all! |
Fixes #1405
Proposed Changes