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

..

endpoints

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

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

registry

Update generated files

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

server

Merge pull request #40624 from smarterclayton/storage_options

2017-02-01 22:28:40 -08:00

BUILD

move genericapiserver authenticator and authorizer factories

2017-01-26 08:50:47 -05:00

doc.go

genericapiserver: fix imports

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