Skip to content

Conversation

@jmagak
Copy link
Member

@jmagak jmagak commented Dec 11, 2024

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s): 1.4

Add the relevant labels to the Pull Request.
Issue: https://issues.redhat.com/browse/RHIDP-3060

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Dec 11, 2024

@jmagak jmagak added Technical review done ⛅ Any procedure has been succesfully tested and removed Technical review needed 🔩 Test all the procedures labels Dec 11, 2024
@themr0c themr0c merged commit 0babf6a into redhat-developer:main Dec 13, 2024
3 checks passed
@themr0c
Copy link
Member

themr0c commented Dec 13, 2024

/cherry-pick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: #787 failed to apply on top of branch "release-1.4":

Applying: Add keycloak plugin 1.4
Using index info to reconstruct a base tree...
M	artifacts/rhdh-plugins-reference/keycloak/keycloak-plugin-admin.adoc
Falling back to patching base and 3-way merge...
Auto-merging artifacts/rhdh-plugins-reference/keycloak/keycloak-plugin-admin.adoc
CONFLICT (content): Merge conflict in artifacts/rhdh-plugins-reference/keycloak/keycloak-plugin-admin.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add keycloak plugin 1.4

In response to this:

/cherry-pick release-1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Dec 13, 2024
* Add keycloak plugin 1.4

* Add keycloak plugin 1.4
themr0c pushed a commit that referenced this pull request Dec 16, 2024
* Add keycloak plugin 1.4 (#787)

* Add keycloak plugin 1.4

* Add keycloak plugin 1.4

* Add keycloak plugin 1.4

* Add keycloak plugin 1.4

---------

Co-authored-by: GitHub Actions <[email protected]>
Gerry-Forde pushed a commit to Gerry-Forde/red-hat-developers-documentation-rhdh-v2 that referenced this pull request Dec 16, 2024
* Add keycloak plugin 1.4

* Add keycloak plugin 1.4
jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Dec 17, 2024
* Add keycloak plugin 1.4 (redhat-developer#787)

* Add keycloak plugin 1.4

* Add keycloak plugin 1.4

* Add keycloak plugin 1.4

* Add keycloak plugin 1.4

---------

Co-authored-by: GitHub Actions <[email protected]>
otikhomi pushed a commit to otikhomi/red-hat-developers-documentation-rhdh that referenced this pull request Jan 20, 2025
* Add keycloak plugin 1.4

* Add keycloak plugin 1.4
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.

6 participants