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.

Sign up for GitHub

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

Jump to bottom

Resolving merge conflicts on USDOT ODE PR #84

Merged
merged 14 commits into from
Jun 5, 2024
Merged

Resolving merge conflicts on USDOT ODE PR #84

merged 14 commits into from
Jun 5, 2024

Commits on Jul 11, 2023

  1. Merge branch 'usdot-jpo-ode:master' into master

    @dmccoystephenson
    dmccoystephenson authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    cbec5c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge branch 'usdot-jpo-ode:master' into master

    @drewjj
    drewjj authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    3c2daee View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'usdot-jpo-ode:master' into master

    @dmccoystephenson
    dmccoystephenson authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    0a486ef View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge branch 'usdot-jpo-ode:master' into master

    @dmccoystephenson
    dmccoystephenson authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    ce7320b View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Merge branch 'usdot-jpo-ode:master' into master

    @dmccoystephenson
    dmccoystephenson authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    38dfb2c View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Include all changes for the security header retention

    @drewjj
    drewjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    1d56e77 View commit details
    Browse the repository at this point in the history

  2. Add release notes

    @drewjj
    drewjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    c8d0611 View commit details
    Browse the repository at this point in the history

  3. Remove unused class tests

    @drewjj
    drewjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    032956e View commit details
    Browse the repository at this point in the history

  4. update maven versions

    @drewjj
    drewjj committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fa4e402 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge pull request usdot-jpo-ode#545 from CDOT-CV/hotfix/security_hea… 

    …ders

JPO-ODE Hotfix for Security Headers
    @SaikrishnaBairamoni
    SaikrishnaBairamoni authored May 23, 2024
    Configuration menu
    Copy the full SHA
    331a90f View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge pull request usdot-jpo-ode#548 from usdot-jpo-ode/master 

    Sync Develop with Master
    @dan-du-car
    dan-du-car authored May 28, 2024
    Configuration menu
    Copy the full SHA
    80ae5f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Merge remote-tracking branch 'usdot/develop' into resolving-merge-con… 

    …flicts-6-3-2024
    @dmccoystephenson
    dmccoystephenson committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    29045de View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Removed start flags from OdeProperties class

    @dmccoystephenson
    dmccoystephenson committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    4e64fce View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge branch 'dev' into resolving-merge-conflicts-6-3-2024

    @dmccoystephenson
    dmccoystephenson committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    6b7b363 View commit details
    Browse the repository at this point in the history