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

Merge Main into Dev #2695

Merged
merged 18 commits into from
Feb 20, 2024
Merged

Merge Main into Dev #2695

merged 18 commits into from
Feb 20, 2024

Conversation

IsaacMilarky
Copy link
Contributor

Description
Fixed the merge conflict with the recent docker changes.

Signed commits

  • Yes, I signed my commits.

sgoggins and others added 18 commits February 12, 2024 18:27
Fix NULL Data Issue in 2 visualization endpoints
add rabbitmq docker configuration
Updating versioning for release publication
Signed-off-by: Andrew Brain <[email protected]>
Signed-off-by: Sean P. Goggins <[email protected]>
docker-compose -> docker compose
Version Update

Signed-off-by: Sean P. Goggins <[email protected]>
Signed-off-by: Sean P. Goggins <[email protected]>
Signed-off-by: Sean P. Goggins <[email protected]>
updated Dockerfile Augur versions
Signed-off-by: Isaac Milarsky <[email protected]>
@@ -339,7 +339,7 @@ def retry_errored_repos():
#TODO: Isaac needs to normalize the status's to be abstract in the

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[pylint] reported by reviewdog 🐶
W0511: TODO: Isaac needs to normalize the status's to be abstract in the (fixme)

@sgoggins sgoggins merged commit 1de0d4b into dev Feb 20, 2024
8 checks passed
@IsaacMilarky IsaacMilarky deleted the fix-dev-main-conflict branch March 13, 2024 18:36
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