Skip to content

Commit b17d2cd

Browse files
kcantrelkcantrel
committed
Resolved conflict.
2 parents fea9a95 + 6309585 commit b17d2cd

36 files changed

+30
-24
lines changed

Solutions/FSxN-as-PVC-for-EKS/README-san.md renamed to EKS/FSxN-as-PVC-for-EKS/README-san.md

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/README.md renamed to EKS/FSxN-as-PVC-for-EKS/README.md

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/backend-tbc-ontap-nas.tmpl renamed to EKS/FSxN-as-PVC-for-EKS/manifests/backend-tbc-ontap-nas.tmpl

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/backend-tbc-ontap-san.tmpl renamed to EKS/FSxN-as-PVC-for-EKS/manifests/backend-tbc-ontap-san.tmpl

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/mysql-nas-clone.yaml renamed to EKS/FSxN-as-PVC-for-EKS/manifests/mysql-nas-clone.yaml

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/mysql-nas.yaml renamed to EKS/FSxN-as-PVC-for-EKS/manifests/mysql-nas.yaml

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/mysql-san-clone.yaml renamed to EKS/FSxN-as-PVC-for-EKS/manifests/mysql-san-clone.yaml

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/mysql-san.yaml renamed to EKS/FSxN-as-PVC-for-EKS/manifests/mysql-san.yaml

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/pvc-from-nas-snapshot.yaml renamed to EKS/FSxN-as-PVC-for-EKS/manifests/pvc-from-nas-snapshot.yaml

File renamed without changes.

Solutions/FSxN-as-PVC-for-EKS/manifests/pvc-from-san-snapshot.yaml renamed to EKS/FSxN-as-PVC-for-EKS/manifests/pvc-from-san-snapshot.yaml

File renamed without changes.

0 commit comments

Comments
 (0)