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

[Manual Cherry-Pick] Fix quantity and lock down others to a more specific type (#1567) #1579

Merged
merged 1 commit into from Aug 5, 2020

Conversation

liamawhite
Copy link
Member

  • Fix quantity and lock down others to correct IntOrString

Signed-off-by: Liam White liam@tetrate.io

  • fix imports

Signed-off-by: Liam White liam@tetrate.io

* Fix quantity and lock down others to correct IntOrString

Signed-off-by: Liam White <liam@tetrate.io>

* fix imports

Signed-off-by: Liam White <liam@tetrate.io>
@liamawhite liamawhite requested a review from a team August 5, 2020 14:11
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Aug 5, 2020
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 5, 2020
@jwendell
Copy link
Member

jwendell commented Aug 5, 2020

@liamawhite are those tests supposed to fail?

@liamawhite
Copy link
Member Author

It seems to be failing on a merge conflict with master. This is the same failure that required me to do a manual cherry-pick. So ¯_(ツ)_/¯?

@jwendell
Copy link
Member

jwendell commented Aug 5, 2020

api repo is too complicated to me... perhaps this should get merged in master first? #1551

@liamawhite
Copy link
Member Author

I think its probably safe to merge otherwise those tests would be required?

@jwendell
Copy link
Member

jwendell commented Aug 5, 2020

Could some api expert advice here?
@rshriram @duderino @louiscryan @dcberg @smawson @linsun

@jwendell
Copy link
Member

jwendell commented Aug 5, 2020

oh, I know what's going on here. The failed tests are tests from master. Not sure why they were triggered in this PR. Have you changed the branch target of this PR after it was created?

@istio-testing istio-testing merged commit 4501d67 into istio:release-1.7 Aug 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants