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 ```

Merge pull request #48324 from jamie-liu/master
9cde4bd6 · Kubernetes Submit Queue · GitHub · 4fe05d81 · 17a0f171 · 9cde4bd6
Commit 9cde4bd6 authored Jun 30, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

ceph-secret-admin.yaml ...persistent-volume-provisioning/rbd/ceph-secret-admin.yaml +0 -1

No files found.
--- a/examples/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
+++ b/examples/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
@@ -6,4 +6,3 @@ type: "kubernetes.io/rbd"
 data:
 #Please note this value is base64 encoded.
  key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ==
-type: kubernetes.io/rbd