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.

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

Automated cherry pick of #28743 #29142

Merged
merged 1 commit into from
Jul 19, 2016
Merged

Automated cherry pick of #28743 #29142

merged 1 commit into from
Jul 19, 2016

Conversation

therc
Copy link
Member

@therc therc commented Jul 18, 2016

Cherry pick of #28743 on release-1.3.

Fix GPU resource validation
c6a06cb 
Because of defaulting, requests are always set if limits are. Thus, the check can never succeed. Instead, make sure that the two values are equal.

Also, remove a few other error messages and remove unnecessary Sprintf calls.
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 18, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 18, 2016

GCE e2e build/test passed for commit c6a06cb.

@fabioy fabioy added lgtm "Looks good to me", indicates that a PR is ready to be merged. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jul 19, 2016
@k8s-github-robot k8s-github-robot added this to the v1.3 milestone Jul 19, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jul 19, 2016

GCE e2e build/test passed for commit c6a06cb.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c8ce0d6 into kubernetes:release-1.3 Jul 19, 2016
@therc therc deleted the automated-cherry-pick-of-#28743-upstream-release-1.3 branch August 18, 2016 06:13
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#29142 from Clarifai/automated-cherry-pi…
c335a2a 
…ck-of-#28743-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#28743

Cherry pick of kubernetes#28743 on release-1.3.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@erictune erictune

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", 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
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
6 participants
@therc @k8s-bot @k8s-github-robot @googlebot @fabioy @erictune