k8s-merge-robot e5cb165ecc Merge pull request #25091 from deads2k/reduce-conflicts ...

Automatic merge from submit-queue

reduce conflict retries

Eliminates quota admission conflicts due to latent caches on the same API server.

@derekwaynecarr

2016-05-25 05:33:23 -07:00

..

admit

rename release_1_2 to internalclientset

2016-02-05 14:02:28 -08:00

alwayspullimages

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

antiaffinity

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

deny

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

exec

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

initialresources

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

limitranger

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

namespace

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

persistentvolume/label

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

resourcequota

Merge pull request #25091 from deads2k/reduce-conflicts

2016-05-25 05:33:23 -07:00

security

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

securitycontext/scdeny

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

serviceaccount

Change rest storage Update interface to retrieve updated object

2016-05-23 21:09:26 -04:00

OWNERS

Move blunderbuss assignees into tree

2016-03-02 20:46:32 -05:00