Closed qahmed1998 closed 1 month ago
@miq-bot assign @Fryguy
@miq-bot add_labels radjabov/yes?, quinteros/yes?, petrosian/yes?
Can you remove the actual pages as well? Or is that planned for a separate PR?
Can you remove the actual pages as well? Or is that planned for a separate PR?
Sure I can remove the physical page as well.
I have removed the files @Fryguy.
@qahmed1998 A conflict occurred during the backport of this pull request to radjabov
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the radjabov
branch in order to resolve this.
Conflict details:
diff --cc _data/site_menu.yml
index 9aaa586b,e2728040..00000000
--- a/_data/site_menu.yml
+++ b/_data/site_menu.yml
@@@ -88,15 -67,11 +88,18 @@@ administration
desc: "Managing OpenStack Infrastructure Providers"
- title: VMware vCenter Providers
- path: "/docs/reference/latest/managing_providers/infrastructure_providers/vmware_vcenter_providers.html"
+ path: "/docs/reference/radjabov/managing_providers/infrastructure_providers/vmware_vcenter_providers.html"
desc: "Managing VMware vCenter Providers"
++<<<<<<< HEAD
+ - title: Microsoft SCVMM Providers
+ path: "/docs/reference/radjabov/managing_providers/infrastructure_providers/microsoft_scvmm_providers.html"
+ desc: "Managing Microsoft SCVMM Providers"
+
++=======
++>>>>>>> c01f2423 (Merge pull request #1816 from qahmed1998/QA-remove-vmm-provider)
- title: IBM Power HMC Providers
- path: "/docs/reference/latest/managing_providers/infrastructure_providers/ibm_power_hmc_providers.html"
+ path: "/docs/reference/radjabov/managing_providers/infrastructure_providers/ibm_power_hmc_providers.html"
desc: "Managing IBM Power HMC Providers"
- title: Configuration Providers
Manually backported to radjabov
via 964d88e34e7ac83ac32b032f08b5b440c010b39e
commit 964d88e34e7ac83ac32b032f08b5b440c010b39e (HEAD -> radjabov, upstream/radjabov)
Author: Jason Frey <fryguy9@gmail.com>
Date: Fri Oct 11 17:59:18 2024 -0400
Merge pull request #1816 from qahmed1998/QA-remove-vmm-provider
QA Removed SCVMM provider
(cherry picked from commit c01f2423de3d99cd28dd92af2ef7f8338a6ba39e)
Manually backported to quinteros
via a2326368e47b73484c84fc225979d91db79ab2b8
commit a2326368e47b73484c84fc225979d91db79ab2b8 (HEAD -> quinteros, upstream/quinteros)
Author: Jason Frey <fryguy9@gmail.com>
Date: Fri Oct 11 17:59:18 2024 -0400
Merge pull request #1816 from qahmed1998/QA-remove-vmm-provider
QA Removed SCVMM provider
(cherry picked from commit c01f2423de3d99cd28dd92af2ef7f8338a6ba39e)
Manually backported to petrosian
via 477f97faf91b38baddacb5bbb52a557d363fc407
commit 477f97faf91b38baddacb5bbb52a557d363fc407 (HEAD -> petrosian, upstream/petrosian)
Author: Jason Frey <fryguy9@gmail.com>
Date: Fri Oct 11 17:59:18 2024 -0400
Merge pull request #1816 from qahmed1998/QA-remove-vmm-provider
QA Removed SCVMM provider
(cherry picked from commit c01f2423de3d99cd28dd92af2ef7f8338a6ba39e)