Merge branch 'master' into chenopis-patch-4

This commit is contained in:
Andrew Chen
2017-01-11 18:15:00 -08:00
committed by GitHub
@@ -8,7 +8,7 @@
```bdocs-tab:example_yaml
apiVersion: v1
kind: Pob
kind: Pod
metadata:
name: pod-example
spec: