Automated cherry pick of #29426 #29499
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Particularly on smaller instances on AWS, we were hitting the 80 second timeout now that our image is well over the 1GB mark. Increase the timeout from 80 seconds to 300 seconds. Fix kubernetes#29418
k8s-github-robot
added
do-not-merge
|
seems reasonable, but i'll let fabio approve as the 1.3 release branch owner. |
|
GCE e2e build/test passed for commit 8a4cba5. |
k8s-github-robot
added
the
cherry-pick-approved
fabioy
added
lgtm
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
GCE e2e build/test passed for commit 8a4cba5. |
|
Automatic merge from submit-queue |
|
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-#29426-origin-release-1.3 Automatic merge from submit-queue Automated cherry pick of kubernetes#29426 Cherry pick of kubernetes#29426 on release-1.3.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick of #29426 on release-1.3.