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

Automated cherry pick of #29982 #30268

Conversation

jsafrane
Copy link
Member

@jsafrane jsafrane commented Aug 9, 2016

Cherry pick of #29982 on release-1.3.

Also, fix unit tests to have the same claim and volume sizes in most of the
tests where we don't test matching based on size and test for a specific size
when we do actually test the matching.
@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 9, 2016
@jsafrane
Copy link
Member Author

jsafrane commented Aug 9, 2016

@saad-ali, picked #29982: "Fix PVC.Status.Capacity and AccessModes after binding" for 1.3.x

@k8s-bot
Copy link

k8s-bot commented Aug 9, 2016

GCE e2e build/test passed for commit a66695d.

@thockin thockin added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 9, 2016
@thockin thockin added this to the v1.3 milestone Aug 9, 2016
@thockin
Copy link
Member

thockin commented Aug 9, 2016

@fabioy Are you still Cherrypick guardian?

@fabioy fabioy added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Aug 9, 2016
@fabioy
Copy link
Contributor

fabioy commented Aug 9, 2016

I am and it's approved. I'll let the merge queue handle it. Thanks.

@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 Aug 9, 2016

GCE e2e build/test passed for commit a66695d.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit faaa963 into kubernetes:release-1.3 Aug 9, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ck-of-#29982-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#29982

Cherry pick of kubernetes#29982 on release-1.3.
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…ck-of-#29982-upstream-release-1.3

Automatic merge from submit-queue

Automated cherry pick of kubernetes#29982

Cherry pick of kubernetes#29982 on release-1.3.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

7 participants