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

fix(java17): add Jackson converter to RestAdapters to avoid Gson (backport #1174) #1176

Merged
merged 1 commit into from
Sep 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

This is an automatic backport of pull request #1174 done by Mergify.
Cherry-pick of c1bd0b1 has failed:

On branch mergify/bp/release-1.32.x/pr-1174
Your branch is up to date with 'origin/release-1.32.x'.

You are currently cherry-picking commit c1bd0b19.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/DockerRegistryConfig.groovy
	modified:   igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/EchoConfig.groovy
	modified:   igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/WerckerConfig.groovy
	modified:   igor-web/src/test/groovy/com/netflix/spinnaker/igor/wercker/WerckerClientSpec.groovy

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/PluginMonitorConfig.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@mattgogerly mattgogerly force-pushed the mergify/bp/release-1.32.x/pr-1174 branch from 1f4750c to 9d053bb Compare September 20, 2023 16:53
@dbyron-sf dbyron-sf added the ready to merge Approved and ready for merge label Sep 20, 2023
@mergify mergify bot added the auto merged label Sep 20, 2023
@mergify mergify bot merged commit 786143d into release-1.32.x Sep 20, 2023
4 checks passed
@mergify mergify bot deleted the mergify/bp/release-1.32.x/pr-1174 branch September 20, 2023 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants