k8s-merge-robot 1e9edfc5c3 Merge pull request #29045 from lixiaobing10051267/mastererrNotAcceptable ...

Automatic merge from submit-queue

Type define note "errNotAcceptable" should be "errUnsupportedMediaType"

In file "pkg\apiserver\errors.go", line 129:
"// errNotAcceptable indicates Content-Type is not recognized"
Here "errNotAcceptable" shuould be "errUnsupportedMediaType", thus consistent with line 131:
"type errUnsupportedMediaType struct"

2016-07-19 01:10:41 -07:00

..

admission

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

api

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

apimachinery

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

apis

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

apiserver

Merge pull request #29045 from lixiaobing10051267/mastererrNotAcceptable

2016-07-19 01:10:41 -07:00

auth

Merge pull request #28281 from nhlfr/authorize-return-bool

2016-07-18 21:40:26 -07:00

capabilities

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

client

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

cloudprovider

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

controller

Merge pull request #28803 from lukaszo/ds

2016-07-18 22:12:14 -07:00

conversion

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

credentialprovider

Merge pull request #28871 from vishh/gce-cp

2016-07-18 14:32:04 -07:00

dns

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

fieldpath

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

fields

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

genericapiserver

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

healthz

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

httplog

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

hyperkube

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

kubectl

Merge pull request #28234 from damemi/record-false-bugfix

2016-07-18 11:32:15 -07:00

kubelet

Merge pull request #28865 from ronnielai/image-gc-0

2016-07-18 22:54:03 -07:00

kubemark

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

labels

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

master

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

metrics

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

probe

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

proxy

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

quota

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

registry

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

runtime

Merge pull request #29042 from dims/fixup-imports

2016-07-18 07:23:38 -07:00

security

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

securitycontext

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

serviceaccount

Check for valid serviceaccount JWT token before inspecting claims

2016-07-06 14:25:15 -04:00

ssh

Revert "Add a customized ssh dialer that will timeout"

2016-07-14 08:48:24 +02:00

storage

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

types

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

ui

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

util

Make volume unmount more robust using exclusive mount w/ O_EXCL

2016-07-18 16:20:08 -07:00

version

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

volume

Make volume unmount more robust using exclusive mount w/ O_EXCL

2016-07-18 16:20:08 -07:00

watch

Use Go canonical import paths

2016-07-16 13:48:21 -04:00

OWNERS

Remove bgrant from pkg/OWNERS and pkg/kubectl/OWNERS since he has plenty to do.

2016-06-16 08:21:27 -07:00