Merge pull request #19365 from jsafrane/devel/retry-delete

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 09:55:21 -08:00
8 changed files with 332 additions and 46 deletions

View File

@@ -279,6 +279,7 @@ pv-recycler-minimum-timeout-hostpath
pv-recycler-minimum-timeout-nfs
pv-recycler-pod-template-filepath-hostpath
pv-recycler-pod-template-filepath-nfs
pv-recycler-maximum-retry
pv-recycler-timeout-increment-hostpath
pvclaimbinder-sync-period
read-only-port