Merge pull request #22293 from dchen1107/test

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-02 03:35:05 -08:00
9 changed files with 628 additions and 560 deletions

View File

@@ -152,7 +152,7 @@ kubelet
--volume-stats-agg-period=1m0s: Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes. To disable volume calculations, set to 0. Default: '1m'
```
###### Auto generated by spf13/cobra on 24-Feb-2016
###### Auto generated by spf13/cobra on 1-Mar-2016
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->