Merge branch 'master' into patch-1

2016-12-30 08:35:04 +08:00
parent 94ee42f658 10a57f1e61
commit 8cc00e2d6c
135 changed files with 1509 additions and 1047 deletions
@@ -101,6 +101,7 @@ Resource type	| Abbreviated alias
 `nodes` |`no`
 `persistentvolumeclaims` |`pvc`
 `persistentvolumes` |`pv`
+`poddisruptionbudget` |`pdb`
 `pods` |`po`
 `podsecuritypolicies` |`psp`
 `podtemplates` |
@@ -112,6 +113,7 @@ Resource type	| Abbreviated alias
 `secrets` |
 `serviceaccounts` |`sa`
 `services` |`svc`
+`statefulsets` |
 `storageclasses` |
 `thirdpartyresources` |