k3s/pkg
Kubernetes Submit Queue 16621cd32d Merge pull request #30022 from juanvallejo/jvallejo_add-timeout-unit-to-scale-help
Automatic merge from submit-queue

Update scale cmd help to display duration "units" in --timeout usage

release-note-none

`kubectl scale` has `--timeout` option, but the help info does not give accepted time units.

The help info gives default value 0 without a unit, potentially misleading a user into thinking they need to pass the numbered time only.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30022)
<!-- Reviewable:end -->
2016-08-08 17:58:02 -07:00
..
admission Fix usage of shared informer in namespace admission controllers 2016-08-01 13:40:34 -04:00
api Merge pull request #29230 from luxas/goimport 2016-08-05 16:22:01 -07:00
apimachinery Merge pull request #28431 from brendandburns/thirdparty2 2016-07-22 09:41:58 -07:00
apis initial generated code for SAR 2016-08-05 11:37:43 -04:00
apiserver Merge pull request #29230 from luxas/goimport 2016-08-05 16:22:01 -07:00
auth Merge pull request #28281 from nhlfr/authorize-return-bool 2016-07-18 21:40:26 -07:00
capabilities Use Go canonical import paths 2016-07-16 13:48:21 -04:00
client install authorization group in 1.4 client 2016-08-06 11:21:41 -07:00
cloudprovider Merge pull request #29230 from luxas/goimport 2016-08-05 16:22:01 -07:00
controller Fix PVC.Status.Capacity and AccessModes after binding 2016-08-08 10:45:42 +02:00
conversion Use Go canonical import paths 2016-07-16 13:48:21 -04:00
credentialprovider Merge pull request #28539 from derekwaynecarr/credential_provider_timeout 2016-07-22 18:01:41 -07:00
dns Merge pull request #29230 from luxas/goimport 2016-08-05 16:22:01 -07:00
fieldpath Use Go canonical import paths 2016-07-16 13:48:21 -04:00
fields Use Go canonical import paths 2016-07-16 13:48:21 -04:00
genericapiserver Merge pull request #25816 from soltysh/scheduledjob_kubectl 2016-08-04 17:36:07 -07:00
healthz fixes the wrong doc in package healthz 2016-07-18 22:46:09 +08:00
httplog Use Go canonical import paths 2016-07-16 13:48:21 -04:00
hyperkube Use Go canonical import paths 2016-07-16 13:48:21 -04:00
kubectl Merge pull request #30022 from juanvallejo/jvallejo_add-timeout-unit-to-scale-help 2016-08-08 17:58:02 -07:00
kubelet Merge pull request #30231 from derekwaynecarr/inodes-summary-api 2016-08-08 12:59:52 -07:00
kubemark
labels Print/log pointers of structs with %#v instead of %+v 2016-08-01 22:27:56 +02:00
master Merge pull request #20573 from deads2k/plumb-in-SAR 2016-08-05 14:39:28 -07:00
metrics
probe Merge pull request #27562 from 7ing/ipt 2016-08-02 08:02:32 -07:00
proxy Run goimports 2016-08-02 15:12:39 +03:00
quota Merge pull request #28991 from ZTE-PaaS/zhangke-patch-008 2016-08-05 15:45:46 -07:00
registry Merge pull request #30181 from mikedanese/csr-delete 2016-08-07 13:04:35 -07:00
runtime add asserts for RecognizingDecoder and update protobuf serializer to implement interface 2016-08-03 17:26:31 -04:00
security Run goimports 2016-08-02 15:12:39 +03:00
securitycontext Remove pod mutation for PVs with supplemental GIDs 2016-07-22 17:41:44 -04:00
serviceaccount Check for valid serviceaccount JWT token before inspecting claims 2016-07-06 14:25:15 -04:00
ssh Revert "Add a customized ssh dialer that will timeout" 2016-07-14 08:48:24 +02:00
storage Merge pull request #22919 from liggitt/http-test-etcd 2016-08-05 12:06:12 -07:00
types Use Go canonical import paths 2016-07-16 13:48:21 -04:00
ui Use Go canonical import paths 2016-07-16 13:48:21 -04:00
util pkg/util/exec: don't specify paths for echo 2016-08-08 16:17:25 +03:00
version Use Go canonical import paths 2016-07-16 13:48:21 -04:00
volume Merge pull request #29619 from dims/fix-issue-23163 2016-08-06 01:44:15 -07:00
watch Use Go canonical import paths 2016-07-16 13:48:21 -04:00
OWNERS