Antoine Pelisse e96b1cb5a1 Add --force-conflicts flag to kubectl ...

The flag allows force on apply so that you can re-acquire ownership of
fields when you have a conflict.

2018-12-14 18:33:36 -08:00

..

api

Merge feature-serverside-apply into master

2018-12-03 11:25:07 -08:00

apis

Merge pull request #71302 from liggitt/verify-unit-test-feature-gates

2018-11-29 21:45:12 -08:00

auth

…

capabilities

…

client

…

cloudprovider

Merge pull request #71294 from Chenditang/verify-golint

2018-11-29 21:45:02 -08:00

controller

Merge feature-serverside-apply into master

2018-12-03 11:25:07 -08:00

credentialprovider

…

features

Merge feature-serverside-apply into master

2018-12-03 11:25:07 -08:00

fieldpath

…

generated

…

kubeapiserver

Merge pull request #70471 from xichengliudui/fix181031

2018-11-29 00:48:16 -08:00

kubectl

Add --force-conflicts flag to kubectl

2018-12-14 18:33:36 -08:00

kubelet

Merge pull request #71263 from ZYecho/fix-spellings

2018-11-30 06:33:50 -08:00

kubemark

…

master

Merge feature-serverside-apply into master

2018-12-03 11:25:07 -08:00

printers

Merge pull request #69874 from stewart-yu/patch-1

2018-11-28 23:31:10 -08:00

probe

…

proxy

[kube-proxy/ipvs] Generalize handling of InactiveConn to TCP

2018-11-29 13:34:13 +01:00

quota

…

registry

Merge pull request #71217 from jsafrane/status-update-unit-test

2018-11-29 15:26:53 -08:00

routes

…

scheduler

Merge pull request #71302 from liggitt/verify-unit-test-feature-gates

2018-11-29 21:45:12 -08:00

security

…

securitycontext

…

serviceaccount

…

ssh

…

util

Fix unit test to run with random UID

2018-11-19 13:08:54 +01:00

version

…

volume

Merge pull request #71302 from liggitt/verify-unit-test-feature-gates

2018-11-29 21:45:12 -08:00

watch/json

…

windows/service

…

.import-restrictions

…

BUILD

…

customers.yaml

…

OWNERS

…