mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source 
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2019-05-07 15:25:11 +05:30
parent 1eff2e1490
commit 68ff602391
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/cephfs/helm/Chart.yaml
View File

@ -4,11 +4,7 @@ appVersion: "1.0.0"
description: "Container Storage Interface (CSI) driver, description: "Container Storage Interface (CSI) driver,
provisioner, and attacher for Ceph cephfs" provisioner, and attacher for Ceph cephfs"
name: ceph-csi-cephfs name: ceph-csi-cephfs
<<<<<<< HEAD
version: 0.6.0 version: 0.6.0
=======
version: 0.5.3
>>>>>>> 882bebf1d8507d6bcd4b4bfae23a861057353785
keywords: keywords:
- ceph - ceph
- cephfs - cephfs

4
deploy/rbd/helm/Chart.yaml
View File

@ -4,11 +4,7 @@ appVersion: "1.0.0"
description: "Container Storage Interface (CSI) driver, description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, and attacher for Ceph RBD" provisioner, snapshotter, and attacher for Ceph RBD"
name: ceph-csi-rbd name: ceph-csi-rbd
<<<<<<< HEAD
version: 0.6.0 version: 0.6.0
=======
version: 0.5.3
>>>>>>> 882bebf1d8507d6bcd4b4bfae23a861057353785
keywords: keywords:
- ceph - ceph
- rbd - rbd