Merge pull request #48324 from jamie-liu/master

Automatic merge from submit-queue (batch tested with PRs 48264, 48324, 48125, 47944, 47489)

Remove duplicated line from ceph-secret-admin.yaml

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

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

**Special notes for your reviewer**:

**Release note**:

```release-note
```
pull/6/head
Kubernetes Submit Queue 2017-06-30 20:58:28 -07:00 committed by GitHub
commit 9cde4bd6fd
1 changed files with 0 additions and 1 deletions

View File

@ -6,4 +6,3 @@ type: "kubernetes.io/rbd"
data:
#Please note this value is base64 encoded.
key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ==
type: kubernetes.io/rbd