Skip to content
This repository has been archived by the owner on Apr 27, 2021. It is now read-only.

Sync upstream #185

Merged
merged 7 commits into from
Dec 12, 2018
Merged

Sync upstream #185

merged 7 commits into from
Dec 12, 2018

Conversation

wayt
Copy link

@wayt wayt commented Dec 12, 2018

Sync upstream to retrieve kubernetes#3551

@Shopify/edgescale

Guihua Zhu and others added 7 commits December 7, 2018 15:42
Signed-off-by: Guihua Zhu <zhuguihua@cmss.chinamobile.com>
…error_types_from_apimachinery

compare error with error types from k8s.io/apimachinery/pkg/api/errors
Signed-off-by: Guihua Zhu <zhuguihua@cmss.chinamobile.com>
…xecuting_diff

handle_error_when_executing_diff
…ficate

Fix --enable-dynamic-certificates for nested subdomain
@wayt wayt requested review from albiere and ElvinEfendi December 12, 2018 16:22
@wayt wayt merged commit 0f37baf into master Dec 12, 2018
@wayt wayt deleted the sync-upstream branch December 12, 2018 18:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants