k8s-merge-robot 5d6397e9ee Merge pull request #27017 from yujuhong/rm_version ...

Automatic merge from submit-queue

Fix docker api version in kubelet

There are two variables `dockerv110APIVersion` and `dockerV110APIVersion` with
the same purpose, but different values. Remove the incorrect one and fix usage
in the file.

/cc @dchen1107 @Random-Liu

2016-06-12 19:31:06 -07:00

..

admission

…

api

Revert "Versioning docs and examples for v1.4.0-alpha.0."

2016-06-10 16:46:46 -07:00

apimachinery

…

apis

Revert "Versioning docs and examples for v1.4.0-alpha.0."

2016-06-10 16:46:46 -07:00

apiserver

Merge pull request #25731 from Pensu/master

2016-06-06 12:06:32 -07:00

auth

…

capabilities

…

client

Fix Retry-After in clients

2016-06-07 21:04:44 +02:00

cloudprovider

Merge pull request #26900 from Clarifai/aws-instance-cache

2016-06-12 14:24:25 -07:00

controller

Merge pull request #26980 from hongchaodeng/fix

2016-06-12 17:59:09 -07:00

conversion

Remove unused deep_copies

2016-06-06 17:18:22 -04:00

credentialprovider

…

dns

Fix srv record lookup

2016-06-03 20:41:08 -07:00

fieldpath

…

fields

…

genericapiserver

Fixing externalAddress in genericapiserver

2016-06-03 11:21:29 -07:00

healthz

…

httplog

…

hyperkube

…

kubectl

Merge pull request #26975 from ericchiang/kubectl-resource-printer-for-rbac-group

2016-06-12 17:13:55 -07:00

kubelet

Merge pull request #27017 from yujuhong/rm_version

2016-06-12 19:31:06 -07:00

kubemark

…

labels

Remove unused deep_copies

2016-06-06 17:18:22 -04:00

master

Revert "ScheduledJob tests"

2016-06-10 16:22:04 +02:00

metrics

Fix call-sites after dep updates

2016-06-02 16:57:28 -07:00

probe

…

proxy

…

quota

Merge pull request #26969 from derekwaynecarr/use_qos_utility

2016-06-12 16:26:39 -07:00

registry

Fix deployment strategy validation

2016-06-10 11:14:32 -07:00

runtime

Remove unused deep_copies

2016-06-06 17:18:22 -04:00

security

…

securitycontext

…

serviceaccount

…

ssh

…

storage

Fix traces

2016-06-06 10:49:46 +02:00

types

…

ui

…

util

Merge pull request #27012 from janetkuo/reduce-pod-list

2016-06-10 20:40:22 -07:00

version

…

volume

Merge pull request #25888 from rootfs/attacher-aws-cinder

2016-06-10 05:39:22 -07:00

watch

…

OWNERS

…