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

feat(jdp): add env vars to enable/configure JDP (backport #804) #814

Merged
merged 7 commits into from
Feb 9, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 8, 2022

This is an automatic backport of pull request #804 done by Mergify.
Cherry-pick of 5fd17e7 has failed:

On branch mergify/bp/v2/pr-804
Your branch is up to date with 'origin/v2'.

You are currently cherry-picking commit 5fd17e73.
  (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:   src/main/extras/app/entrypoint.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md
	both modified:   pom.xml
	both modified:   run.sh

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

* feat(jdp): add env var to enable JDP

* feat(jdp): add env vars for JDP addr and port

* enable JDP in development tests

* fix(jdp): broken env var checks

* default JDP to true for backward compatibility

(cherry picked from commit 5fd17e7)

# Conflicts:
#	README.md
#	pom.xml
#	run.sh
@github-actions
Copy link
Contributor

github-actions bot commented Feb 8, 2022

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
@github-actions
Copy link
Contributor

github-actions bot commented Feb 8, 2022

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@andrewazores andrewazores added the feat New feature or request label Feb 8, 2022
@andrewazores andrewazores merged commit 6d6dbb1 into v2 Feb 9, 2022
@mergify mergify bot deleted the mergify/bp/v2/pr-804 branch February 9, 2022 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feat New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants