Kubernetes Submit Queue 01ac994541 Merge pull request #40689 from deads2k/add-details-to-patch-err ...

Automatic merge from submit-queue (batch tested with PRs 39169, 40719, 38954, 40808, 40689)

add details to patch conflict

Adds conflict details to the patch message so we can debug #39471.  Seems like this may have general utility since others may also wonder what they conflicted on.

@sig-api

2017-02-02 02:05:24 -08:00

..

filters

Update bazel

2017-02-01 13:49:28 +01:00

handlers

Merge pull request #40689 from deads2k/add-details-to-patch-err

2017-02-02 02:05:24 -08:00

openapi

Update Bazel

2017-01-30 20:05:21 -08:00

testing

…

apiserver_test.go

pkg/genericapiserver/endpoints: cutting off pkg/api deps

2017-02-02 06:58:29 +01:00

apiserver.go

genericapiserver: fix imports

2017-01-19 13:06:47 +01:00

BUILD

Update generated files

2017-02-02 06:58:58 +01:00

discovery.go

genericapiserver: fix imports

2017-01-19 13:06:47 +01:00

doc.go

genericapiserver: fix imports

2017-01-19 13:06:47 +01:00

groupversion.go

refactor: move ListOptions references to metav1

2017-01-23 17:52:46 -05:00

installer_test.go

declare it, but no use it

2017-01-20 15:14:52 +08:00

installer.go

Merge pull request #33684 from fraenkel/port_forward_ws

2017-02-01 23:19:02 -08:00

OWNERS

Remove spxtr from several owners files, add rmmh as test reviewer.

2017-01-30 13:45:21 -08:00

proxy_test.go

genericapiserver: fix imports

2017-01-19 13:06:47 +01:00

watch_test.go

pkg/genericapiserver/endpoints: cutting off pkg/api deps

2017-02-02 06:58:29 +01:00