rebase onto head

This commit is contained in:
Mike Danese
2015-09-12 09:46:10 -07:00
parent 30f5b93d2f
commit 54b0faf39a
7 changed files with 68 additions and 93 deletions

View File

@@ -112,6 +112,7 @@ __custom_func() {
valid_resources = `Valid resource types include:
* pods (aka 'po')
* replicationcontrollers (aka 'rc')
* daemonsets (aka 'ds')
* services (aka 'svc')
* events (aka 'ev')
* nodes (aka 'no')