k8s-merge-robot f50bb73ed6 Merge pull request #26136 from AdoHe/kubectl_apply_overwrite ...

Automatic merge from submit-queue

kubectl apply add --overwrite flag

```release-note
Add "kubectl --overwrite" flag to automatically resolve conflicts between the modified and live configuration using values from the modified configuration.
```
fixes #17238

This PR just add the `--overwrite` flag, pkg/strategicpatch has already support overwrite. @bgrant0607 @jackgr ptal.

2016-07-18 10:47:53 -07:00

..

admission

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

api

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

apimachinery

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

apis

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

apiserver

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

auth

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

capabilities

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

client

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

cloudprovider

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

controller

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

conversion

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

credentialprovider

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

dns

Use Go canonical import paths

2016-07-16 13:48:21 -04: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

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

healthz

Use Go canonical import paths

2016-07-16 13:48:21 -04: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 #26136 from AdoHe/kubectl_apply_overwrite

2016-07-18 10:47:53 -07:00

kubelet

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

kubemark

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

labels

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

master

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

metrics

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

probe

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

proxy

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

quota

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

registry

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

runtime

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

security

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

securitycontext

Use Go canonical import paths

2016-07-16 13:48:21 -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

Use Go canonical import paths

2016-07-16 13:48:21 -04: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

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

version

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

volume

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

watch

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

OWNERS

Remove bgrant from pkg/OWNERS and pkg/kubectl/OWNERS since he has plenty to do.

2016-06-16 08:21:27 -07:00