k8s-merge-robot 421c16addd Merge pull request #25894 from brendandburns/thirdparty-watch ...

Automatic merge from submit-queue

Fix third party

Fixes https://github.com/kubernetes/kubernetes/issues/25421
Fixes https://github.com/kubernetes/kubernetes/issues/25422

@AdoHe @sjenning @caesarxuchao @lavalamp 

@kubernetes/sig-api-machinery 

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

2016-06-04 15:42:41 -07:00

..

editor

Improve terminal reuse and attach

2016-03-21 23:59:58 -04:00

jsonmerge

move HasConflicts to shareable location

2015-10-05 14:37:57 -04:00

clientcache.go

add get/create/delete for clusters

2016-05-16 16:34:08 -07:00

factory_test.go

kubectl: move printObjectSpecificMessage in factory

2016-05-28 18:33:58 +02:00

factory.go

Merge pull request #25894 from brendandburns/thirdparty-watch

2016-06-04 15:42:41 -07:00

helpers_test.go

Add support for labelling 3rd party objects

2016-05-23 13:13:35 -07:00

helpers.go

Merge pull request #26597 from caesarxuchao/fix-26425

2016-06-01 00:02:43 -07:00

printing.go

-t shorthand for --tty instead of --template

2016-04-15 17:12:42 -07:00