k8s-merge-robot 69b90028cf Merge pull request #26086 from smarterclayton/init_ordering ...

Automatic merge from submit-queue

Ensure that init containers are preserved during pruning

Pods with multiple init containers were getting the wrong containers
pruned. Fix an error message and add a test.

Fixes #26131

2016-05-25 15:38:39 -07:00

..

admission

Change rest storage Update interface to retrieve updated object

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

api

Downward API implementation for resources limits and requests

2016-05-24 12:22:35 -04:00

apimachinery

…

apis

Merge pull request #24947 from hpcloud/hpe/vsphere-volume

2016-05-22 20:40:14 -07:00

apiserver

Change rest storage Update interface to retrieve updated object

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

auth

Add an 'authenticated user' metric to the RequestAuthenticator.

2016-05-19 16:04:11 -07:00

capabilities

…

client

Fix govet error in reflect_resync test

2016-05-23 12:50:46 +02:00

cloudprovider

Log requests to GCE

2016-05-24 18:14:37 +02:00

controller

Merge pull request #26123 from brendandburns/flaker

2016-05-25 14:29:48 -07:00

conversion

…

credentialprovider

…

dns

Implement tests for federation queries.

2016-05-23 11:35:50 +05:30

fieldpath

Downward API implementation for resources limits and requests

2016-05-24 12:22:35 -04:00

fields

…

genericapiserver

Change rest storage Update interface to retrieve updated object

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

healthz

…

httplog

…

hyperkube

…

kubectl

Merge pull request #24179 from aveshagarwal/master-downward-api-resources-limits-requests-implementation

2016-05-25 03:38:49 -07:00

kubelet

Merge pull request #26086 from smarterclayton/init_ordering

2016-05-25 15:38:39 -07:00

kubemark

…

labels

Make IsValidLabelValue return error strings

2016-05-17 21:36:10 -07:00

master

Change rest storage Update interface to retrieve updated object

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

metrics

Add an 'authenticated user' metric to the RequestAuthenticator.

2016-05-19 16:04:11 -07:00

probe

…

proxy

…

quota

Update use of Quantity in other classes

2016-05-19 08:41:43 -04:00

registry

Change rest storage Update interface to retrieve updated object

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

runtime

Merge pull request #25540 from krousey/discovery_mapper

2016-05-21 07:13:49 -07:00

security

Adding volume plugin to api/v1 and updating auto-generated files

2016-05-21 12:53:03 -07:00

securitycontext

…

serviceaccount

Make name validators return string slices

2016-05-18 00:48:01 -07:00

ssh

…

storage

reduce conflict retries

2016-05-23 13:09:37 -04:00

types

…

ui

…

util

Merge pull request #25501 from soltysh/net_remoteaddr

2016-05-22 16:53:41 -07:00

version

…

volume

Downward API implementation for resources limits and requests

2016-05-24 12:22:35 -04:00

watch

…

OWNERS

…