k8s-merge-robot 0d02f8c0f6 Merge pull request #26557 from AdoHe/patch_retry ...

Automatic merge from submit-queue

kubectl apply retry stale resource version

```release-note
kubectl apply: retry applying a patch if a version conflict error is encountered
```

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

fixes #15493 
@pwittrock I just got my original implementation back, ptal.

2016-06-13 10:13:27 -07:00

..

cmd

Merge pull request #26557 from AdoHe/patch_retry

2016-06-13 10:13:27 -07:00

resource

Merge pull request #26686 from metral/fix-get-output

2016-06-11 14:26:31 -07:00

testing

It's 2016, yo.

2016-05-13 12:41:40 -07:00

apply.go

kubectl apply retry stale resource version

2016-06-09 00:14:17 -04:00

autoscale.go

Added hpa/v1 generator to kubectl autoscale

2016-06-10 09:26:35 +02:00

bash_comp_utils.go

pkg/kubectl: preallocate slice

2016-05-29 02:09:39 -07:00

configmap_test.go

…

configmap.go

…

custom_column_printer_test.go

…

custom_column_printer.go

…

describe_test.go

Update kubectl describe pod to use pod level qos

2016-06-03 15:32:32 -04:00

describe.go

AWS: kubectl get service should print hostnames for LoadBalancer services

2016-06-08 19:29:48 -04:00

doc.go

…

explain.go

…

generate_test.go

…

generate.go

fix expose multi protocols issue

2016-05-12 00:07:07 -04:00

history.go

List RSes once when getting old/new RSes in deployment e2e tests

2016-06-01 14:19:35 -07:00

interfaces.go

…

kubectl_test.go

…

kubectl.go

pkg/kubectl: preallocate slice

2016-05-29 02:09:39 -07:00

namespace_test.go

release-note-none

2016-05-10 09:55:14 -07:00

namespace.go

…

OWNERS

Add pwittrock to the kubectl OWNERS file

2016-06-02 09:21:25 -07:00

proxy_server_test.go

…

proxy_server.go

…

resource_printer_test.go

AWS: kubectl get service should print hostnames for LoadBalancer services

2016-06-08 19:29:48 -04:00

resource_printer.go

Merge pull request #26975 from ericchiang/kubectl-resource-printer-for-rbac-group

2016-06-12 17:13:55 -07:00

rollback.go

…

rolling_updater_test.go

Fix tests for renegotiation

2016-05-12 08:21:11 +02:00

rolling_updater.go

Rolling updater should allow progress to be logged / detected

2016-05-14 22:54:02 -04:00

rollout_status.go

Add kubectl rollout status

2016-05-10 13:49:39 -07:00

run_test.go

Update use of Quantity in other classes

2016-05-19 08:41:43 -04:00

run.go

pkg/kubectl: preallocate slice

2016-05-29 02:09:39 -07:00

scale_test.go

ScheduledJob client

2016-05-21 15:48:40 +02:00

scale.go

…

secret_for_docker_registry_test.go

…

secret_for_docker_registry.go

…

secret_for_tls_test.go

Add a kubectl create secret tls command

2016-05-16 22:38:56 -07:00

secret_for_tls.go

Add a kubectl create secret tls command

2016-05-16 22:38:56 -07:00

secret_test.go

…

secret.go

…

service_test.go

fix expose multi protocols issue

2016-05-12 00:07:07 -04:00

service.go

fix expose multi protocols issue

2016-05-12 00:07:07 -04:00

serviceaccount_test.go

…

serviceaccount.go

…

sorted_event_list_test.go

…

sorted_event_list.go

…

sorted_resource_name_list_test.go

Show resources in pod descriptions by sorted names.

2016-05-25 23:51:37 +02:00

sorted_resource_name_list.go

Show resources in pod descriptions by sorted names.

2016-05-25 23:51:37 +02:00

sorting_printer_test.go

…

sorting_printer.go

Support sort-by timestamp in kubectl get

2016-05-18 21:36:44 -07:00

stop_test.go

…

stop.go

kubectl: cast scale errors to actual errors when deleting

2016-05-26 10:33:52 +02:00

version.go

…

watchloop.go

…