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

(maint) Merge 7.x branch #2765

Closed
wants to merge 7 commits into from
Closed

(maint) Merge 7.x branch #2765

wants to merge 7 commits into from

Commits on Jul 18, 2023

  1. (PE-36479) remove use of clj-yaml 

    This removes the use of clj-yaml, and replaces it with a use of
snake-yaml as implemented in trapperkeeper. This is to help
resolve https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471

which can't be fully resolved due to a dependency on snakeyaml 1.3.3 by jRuby
    @jonathannewman
    jonathannewman committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    e85f88b View commit details
    Browse the repository at this point in the history

  2. Merge pull request puppetlabs#2763 from jonathannewman/PE-36479/7.x/r… 

    …emove-clj-yaml

(PE-36479) remove use of clj-yaml
    @steveax
    steveax authored Jul 18, 2023
    Configuration menu
    Copy the full SHA
    19d50dc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. (maint) update submodule versions and agent pin

    @puppetlabs-jenkins
    puppetlabs-jenkins committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    4f60e00 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. (PE-36184) Update ezbake to 2.5.0 in prep for logback 1.3.x bump

    @rileynewton
    rileynewton committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    98eef22 View commit details
    Browse the repository at this point in the history

  2. Merge pull request puppetlabs#2764 from rileynewton/PE-36184-update-e… 

    …zbake-to-2.5.0-for-logback

(PE-36184) Update ezbake to 2.5.0 in prep for logback 1.3.x bump
    @jonathannewman
    jonathannewman authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    67af1b3 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. (maint) update submodule versions and agent pin

    @puppetlabs-jenkins
    puppetlabs-jenkins committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    3f1f0d9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/7.x' into merge-7.x

    @rileynewton
    rileynewton committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6449060 View commit details
    Browse the repository at this point in the history