Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QA Removed SCVMM provider #1816

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Conversation

qahmed1998
Copy link
Contributor

No description provided.

@qahmed1998
Copy link
Contributor Author

@miq-bot assign @Fryguy

@qahmed1998
Copy link
Contributor Author

@miq-bot add_labels radjabov/yes?, quinteros/yes?, petrosian/yes?

@Fryguy
Copy link
Member

Fryguy commented Oct 11, 2024

Can you remove the actual pages as well? Or is that planned for a separate PR?

@Fryguy Fryguy self-assigned this Oct 11, 2024
@qahmed1998
Copy link
Contributor Author

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.

@qahmed1998
Copy link
Contributor Author

I have removed the files @Fryguy.

@Fryguy Fryguy merged commit c01f242 into ManageIQ:master Oct 11, 2024
2 checks passed
github-actions bot pushed a commit to ManageIQ/manageiq.github.io that referenced this pull request Oct 11, 2024
@Fryguy
Copy link
Member

Fryguy commented Oct 22, 2024

@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

Fryguy added a commit that referenced this pull request Oct 30, 2024
QA Removed SCVMM provider

(cherry picked from commit c01f242)
@Fryguy
Copy link
Member

Fryguy commented Oct 30, 2024

Manually backported to radjabov via 964d88e

commit 964d88e34e7ac83ac32b032f08b5b440c010b39e (HEAD -> radjabov, upstream/radjabov)
Author: Jason Frey <[email protected]>
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)

Fryguy added a commit that referenced this pull request Oct 30, 2024
QA Removed SCVMM provider

(cherry picked from commit c01f242)
@Fryguy
Copy link
Member

Fryguy commented Oct 30, 2024

Manually backported to quinteros via a232636

commit a2326368e47b73484c84fc225979d91db79ab2b8 (HEAD -> quinteros, upstream/quinteros)
Author: Jason Frey <[email protected]>
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)

Fryguy added a commit that referenced this pull request Oct 30, 2024
QA Removed SCVMM provider

(cherry picked from commit c01f242)
@Fryguy
Copy link
Member

Fryguy commented Oct 30, 2024

Manually backported to petrosian via 477f97f

commit 477f97faf91b38baddacb5bbb52a557d363fc407 (HEAD -> petrosian, upstream/petrosian)
Author: Jason Frey <[email protected]>
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)

github-actions bot pushed a commit to ManageIQ/manageiq.github.io that referenced this pull request Oct 30, 2024
github-actions bot pushed a commit to ManageIQ/manageiq.github.io that referenced this pull request Oct 30, 2024
github-actions bot pushed a commit to ManageIQ/manageiq.github.io that referenced this pull request Oct 30, 2024
github-actions bot pushed a commit to ManageIQ/manageiq.github.io that referenced this pull request Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants