From ba64cba0a727999582244718729ff11bfe4f3a50 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 17 Aug 2018 17:25:20 -0700
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.12

Kubernetes-commit: afbbe62576a41209ca42a77a713e54290377484e