Sync CDOT dev branch with changes in USDOT develop #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpo-security-svcs-1.0.0
merge Release/1.0.1 to master
Updating Base Image & Version
Merge dev branch into release branch
Bumps httpclient from 4.5.3 to 4.5.13. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Add Release_notes.md
Merge release 1.1.0 into master
…en/org.apache.httpcomponents-httpclient-4.5.13 Bump httpclient from 4.5.3 to 4.5.13
Merge release branch into master branch
Update releasenotes.md with new version 1.2.0
Sync Master branch to develop
Merge Q3 release into master
Sync master into develop for q3 release
…with-usdot-develop
|
Any idea why this is doing CI checks while other pull requests on this repo didn't? |
Aw! It added a ci.yml. We should probably make sure this is running y21 like the project. |
drewjj
approved these changes
Jan 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The purpose of this PR is to merge the latest changes in USDOT's develop branch into CDOT's dev branch. This addresses some merge conflicts for usdot-jpo-ode#25.