Merge pull request #21870 from mqliang/lookup-cache

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-24 20:01:29 -08:00
14 changed files with 846 additions and 751 deletions

View File

@@ -291,6 +291,7 @@ pv-recycler-pod-template-filepath-nfs
pv-recycler-maximum-retry
pv-recycler-timeout-increment-hostpath
pvclaimbinder-sync-period
rc-lookup-cache-size
read-only-port
really-crash-for-testing
reconcile-cidr
@@ -316,6 +317,7 @@ rkt-path
rkt-stage1-image
root-ca-file
root-dir
rs-lookup-cache-size
run-proxy
runtime-config
runtime-cgroups