k8s-merge-robot 3494f8e2f9 Merge pull request #28581 from lixiaobing10051267/masternotesorder ...

Automatic merge from submit-queue

The notes are inconsistent with the code

 In file "pkg/client/cache/store.go, the notes of line 102 "name and namespace" is inconsistent with line 103 "return parts[0], parts[1], nil", because parts[0] is namespace, and parts[1] is name, It is easy to be confused, and better to modify the notes to "namespace and name".

2016-07-07 16:22:50 -07:00

..

admission

Remove "All rights reserved" from all the headers.

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

api

Merge pull request #21240 from thockin/validation_pt8

2016-07-07 14:37:11 -07:00

apimachinery

Remove "All rights reserved" from all the headers.

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

apis

Merge branch 'master' into fix-typos

2016-07-04 11:20:47 +08:00

apiserver

Merge pull request #28036 from ericchiang/oidc-auth-plugin-dont-error-if-provider-is-unavailable

2016-06-30 13:02:16 -07:00

auth

Remove "All rights reserved" from all the headers.

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

capabilities

Merge branch 'master' into fix-typos

2016-07-04 11:20:47 +08:00

client

Merge pull request #28581 from lixiaobing10051267/masternotesorder

2016-07-07 16:22:50 -07:00

cloudprovider

Remove "All rights reserved" from all the headers.

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

controller

Merge pull request #28550 from janetkuo/e2e-deployment-rollover-log

2016-07-07 07:33:30 -07:00

conversion

Merge pull request #28204 from thockin/cleanup-third_party

2016-07-07 12:13:14 -07:00

credentialprovider

Remove "All rights reserved" from all the headers.

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

dns

Remove "All rights reserved" from all the headers.

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

fieldpath

Remove "All rights reserved" from all the headers.

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

fields

Remove "All rights reserved" from all the headers.

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

genericapiserver

Represent unversioned.Time correctly in swagger spec

2016-07-01 23:23:19 -07:00

healthz

Remove "All rights reserved" from all the headers.

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

httplog

Get rid of DeleteAllEtcdKeys

2016-07-05 22:10:47 +02:00

hyperkube

Remove "All rights reserved" from all the headers.

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

kubectl

Merge pull request #21240 from thockin/validation_pt8

2016-07-07 14:37:11 -07:00

kubelet

Merge pull request #24705 from derekwaynecarr/port_active_deadline

2016-07-07 12:49:02 -07:00

kubemark

Remove "All rights reserved" from all the headers.

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

labels

Merge pull request #27848 from liubin/fix-typos

2016-07-06 23:36:49 -07:00

master

Get rid of DeleteAllEtcdKeys

2016-07-05 22:10:47 +02:00

metrics

Remove "All rights reserved" from all the headers.

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

probe

Remove "All rights reserved" from all the headers.

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

proxy

Merge pull request #28434 from thockin/br-netfilter-warning

2016-07-07 10:27:20 -07:00

quota

Remove "All rights reserved" from all the headers.

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

registry

allocator ETCD: remove unused Refresh()

2016-07-05 12:46:53 -07:00

runtime

Remove "All rights reserved" from all the headers.

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

security

Remove "All rights reserved" from all the headers.

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

securitycontext

Remove "All rights reserved" from all the headers.

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

serviceaccount

Revert "update jwt-go to v3.0.0-4-g01aeca5"

2016-07-06 10:41:50 -07:00

ssh

Remove "All rights reserved" from all the headers.

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

storage

cacher: replace usable lock with conditional variable

2016-07-04 08:57:59 -07:00

types

Remove "All rights reserved" from all the headers.

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

ui

Remove "All rights reserved" from all the headers.

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

util

Merge pull request #21240 from thockin/validation_pt8

2016-07-07 14:37:11 -07:00

version

Remove "All rights reserved" from all the headers.

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

volume

Merge pull request #28448 from thockin/gce-pd-discard

2016-07-07 11:01:43 -07:00

watch

Remove "All rights reserved" from all the headers.

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

OWNERS

…