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

Forward-merge branch-23.07 to branch-23.11 [resolved conflicts] #1246

Merged

Conversation

dagardner-nv
Copy link
Contributor

Description

Resolved conflicts from forward merger PR#1241

By Submitting this PR I confirm:

  • I am familiar with the Contributing Guidelines.
  • When the PR is ready for review, new or existing tests cover these changes.
  • When the PR is ready for review, the documentation is up to date with these changes.

drobison00 and others added 4 commits October 4, 2023 15:53
Update meta.yaml for CVE 2307 mitigation

Authors:
  - Devin Robison (https://github.com/drobison00)
  - David Gardner (https://github.com/dagardner-nv)

Approvers:
  - David Gardner (https://github.com/dagardner-nv)
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: nv-morpheus#1242
…pheus#1243)

- Updated SQL loader to utilize connections from the pool.
- Fixed control message utility variable referenced before assignment error.
closes nv-morpheus#1237 nv-morpheus#1235

Authors:
  - Bhargav Suryadevara (https://github.com/bsuryadevara)

Approvers:
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: nv-morpheus#1243
@dagardner-nv dagardner-nv requested review from a team as code owners October 5, 2023 13:42
@dagardner-nv dagardner-nv self-assigned this Oct 5, 2023
@dagardner-nv dagardner-nv added bug Something isn't working ! - Hotfix Related to a Hotfix Release dependencies Pull requests that update a dependency file non-breaking Non-breaking change labels Oct 5, 2023
ci/conda/recipes/morpheus/meta.yaml Outdated Show resolved Hide resolved
@dagardner-nv dagardner-nv merged commit f1bb834 into nv-morpheus:branch-23.11 Oct 5, 2023
7 checks passed
@dagardner-nv dagardner-nv deleted the branch-23.11-merge-23.07 branch April 9, 2024 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
! - Hotfix Related to a Hotfix Release bug Something isn't working dependencies Pull requests that update a dependency file non-breaking Non-breaking change
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

4 participants