Kubernetes Submit Queue 3bb2d12e80 Merge pull request #48931 from allencloud/remove-duplicated-word-file-in-error ...

Automatic merge from submit-queue (batch tested with PRs 48572, 48838, 48931, 48783, 47090)

remove duplicated word file in error

Signed-off-by: allencloud <allen.sun@daocloud.io>



**What this PR does / why we need it**:

remove duplicated word file in error

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
NONE

**Special notes for your reviewer**:
NONE

**Release note**:

```release-note
NONE
```

2017-07-14 10:53:49 -07:00

..

api

Merge pull request #48815 from dixudx/mountpath_should_be_absolute

2017-07-13 22:43:56 -07:00

apimachinery/tests

Move pkg/apimachinery/test to apimachinery

2017-07-08 08:48:38 +08:00

apis

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

auth

Only do string trim when it's necessary

2017-06-15 17:32:31 +08:00

bootstrap/api

run hack/update-all

2017-06-22 11:31:03 -07:00

capabilities

…

client

Merge pull request #48641 from smarterclayton/refactor_exec

2017-07-12 14:08:10 -07:00

cloudprovider

Merge pull request #46360 from khenidak/azure-pd-final

2017-07-14 09:57:51 -07:00

controller

Merge pull request #47042 from gyliu513/event-count

2017-07-12 14:08:04 -07:00

conversion

…

credentialprovider

Code updates for new SDK.

2017-07-12 06:09:31 -07:00

features

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

fieldpath

Add Pod UID (metadata.uid) to downward API env var

2017-06-27 16:54:35 +08:00

fields

…

generated

Move pkg/apimachinery/test to apimachinery

2017-07-08 08:48:38 +08:00

hyperkube

…

kubeapiserver

Merge pull request #47038 from yastij/DefaultExternalHost-for-registredCP

2017-06-27 08:29:25 -07:00

kubectl

Merge pull request #48572 from alexandercampbell/kubectl-follow-options-pattern-in-version

2017-07-14 10:49:11 -07:00

kubelet

Merge pull request #48669 from supereagle/revert-pr46246

2017-07-14 00:32:09 -07:00

kubemark

Merge pull request #47783 from NickrenREN/containerruntime

2017-06-23 08:29:28 -07:00

labels

…

master

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

printers

remove duplicated word file in error

2017-07-14 18:01:51 +08:00

probe

Set default User-Agent on http probe

2017-06-21 10:50:33 -04:00

proxy

Merge pull request #48635 from dcbw/userspace-proxy-silence-loadbalancerrr-message

2017-07-12 10:57:21 -07:00

quota

run hack/update-all

2017-06-22 11:31:03 -07:00

registry

Merge pull request #48734 from tallclair/namechange

2017-07-12 04:56:32 -07:00

routes

…

runtime

…

security

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

securitycontext

run hack/update-all

2017-06-22 11:31:03 -07:00

serviceaccount

don't accept delete tokens that are waiting to be reaped

2017-06-30 09:22:36 -04:00

ssh

…

types

…

util

Merge pull request #48555 from redbaron/hostPath-and-subPath-symlink

2017-07-12 23:43:12 -07:00

version

Convert go_binary linkstamp to x_defs

2017-06-08 14:59:55 -07:00

volume

Add Azure managed disk support

2017-07-14 14:09:44 +08:00

watch

…

BUILD

Merge pull request #48598 from gmarek/metrics

2017-07-12 03:02:19 -07:00

OWNERS

…