Merge pull request #18712 from pmorie/config-kubectl

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-13 13:51:29 -08:00
9 changed files with 3122 additions and 644 deletions

File diff suppressed because it is too large Load Diff