Skip to content

Conversation

@openshift-cherrypick-robot
Copy link
Contributor

This is an automated cherry-pick of #714

/assign Gerry-Forde

@rhdh-bot
Copy link
Collaborator

@Gerry-Forde Gerry-Forde merged commit 2bcafd6 into redhat-developer:release-1.4 Jan 21, 2025
3 checks passed
@Gerry-Forde
Copy link
Member

@missmesss Olga, the JFrog docs are now published for RHDH 1.4 - thanks for all your work on this content.

@Gerry-Forde
Copy link
Member

/cherrypick main

@openshift-cherrypick-robot
Copy link
Contributor Author

@Gerry-Forde: #866 failed to apply on top of branch "main":

Applying: adding artifactory plugin content
.git/rebase-apply/patch:119: trailing whitespace.
* You have enabled the JFrog Artifactory plugin. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	assemblies/dynamic-plugins/assembly-configuring-rhdh-plugins.adoc
M	assemblies/dynamic-plugins/assembly-using-rhdh-plugins.adoc
Falling back to patching base and 3-way merge...
Auto-merging assemblies/dynamic-plugins/assembly-configuring-rhdh-plugins.adoc
CONFLICT (add/add): Merge conflict in artifacts/rhdh-plugins-reference/jfrog-artifactory/jfrog-artifactory-plugin-user.adoc
Auto-merging artifacts/rhdh-plugins-reference/jfrog-artifactory/jfrog-artifactory-plugin-user.adoc
CONFLICT (add/add): Merge conflict in artifacts/rhdh-plugins-reference/jfrog-artifactory/jfrog-artifactory-plugin-admin.adoc
Auto-merging artifacts/rhdh-plugins-reference/jfrog-artifactory/jfrog-artifactory-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 adding artifactory plugin content

In response to this:

/cherrypick main

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants