Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-concat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.3.3
Choose a base ref
...
head repository: puppetlabs/puppetlabs-concat
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v7.4.0
Choose a head ref
  • 18 commits
  • 20 files changed
  • 11 contributors

Commits on Mar 15, 2023

  1. puppet5: drop remnants of puppet5 code 

    puppet 5 support was dropped sometime ago.  This PR simply removes some
old code which was around to support puppet5's lack of deferred
functions
    @b4ldr
    b4ldr committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    5533be5 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Merge pull request #761 from b4ldr/drop_puppet5 

    puppet5: drop remnants of puppet5 code
    @LukasAud
    LukasAud authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    393b816 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. "This change pins the puppetlabs-puppet_agent module to v4.12.1. Prev… 

    …iosuly the fixutre was configured to pull from main. Given the recent changes when moving towards puppet8 main is unsafe."
    @GSPatton
    GSPatton committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    3e6ca41 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #763 from puppetlabs/pdksync_(MAINT)_Pin_puppetlab… 

    …s-puppet_agent

pdksync - (CONT-768) Pin puppetlabs-puppet_agent
    @jordanbreen28
    jordanbreen28 authored Mar 22, 2023
    Configuration menu
    Copy the full SHA
    285e3c2 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. (CONT-229) - Implement reusable workflows

    @jordanbreen28
    jordanbreen28 committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    af7fd46 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #764 from puppetlabs/pdksync_CONT-229-Implement_re… 

    …usable_workflows

pdksync - CONT-229-Implement reusable workflows
    @GSPatton
    GSPatton authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    c94a469 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. (CONT-826) Temporarily pin puppet_litmus to 0.34.6 or less

    @david22swan
    david22swan committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    8d96944 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #765 from puppetlabs/pdksync_CONT-826/main/pin_pup… 

    …pet_litmus

pdksync - CONT-826/main/pin_puppet_litmus
    @LukasAud
    LukasAud authored Mar 28, 2023
    Configuration menu
    Copy the full SHA
    2df5a25 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. Allow content parameter of concat_fragment to be Sensitive 

    Fixes #742.
    @baurmatt
    baurmatt committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    91a6370 View commit details
    Browse the repository at this point in the history

  2. We can't modifiy a frozen string. Duplicate it for modification

    @alexjfisher @baurmatt
    alexjfisher authored and baurmatt committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    9ccd1c6 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Add parameter to not create empty files when no fragments are defined 

    By default concat would always create an empty file if no fragment was
defined. Sometimes we don't want a file unless it has content.
    @JonasVerhofste
    JonasVerhofste committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    6f2c7d3 View commit details
    Browse the repository at this point in the history

  2. Update reference with rake strings:generate:reference

    @JonasVerhofste
    JonasVerhofste committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    2b61a6f View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. (CONT-844) - Update .sync.yml

    @jordanbreen28
    jordanbreen28 committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    0063e07 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #767 from puppetlabs/pdksync_CONT-844-update_.sync… 

    ….yml

pdksync - (CONT-844) - Update .sync.yml
    @GSPatton
    GSPatton authored Apr 5, 2023
    Configuration menu
    Copy the full SHA
    466e410 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Merge pull request #757 from syseleven/support-sensitive 

    Allow content parameter of concat_fragment to be Sensitive
    @LukasAud
    LukasAud authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    1762b4d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #766 from UGent-DICT/feature/no_empty_file 

    Add parameter to not create empty files when no fragments are defined
    @LukasAud
    LukasAud authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    0518492 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Release prep v7.4.0

    GitHub Actions committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    6e69024 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #769 from puppetlabs/release-prep 

    Release prep v7.4.0
    @LukasAud
    LukasAud authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    6981111 View commit details
    Browse the repository at this point in the history
Loading