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: v6.0.0
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: v6.1.0
Choose a head ref
  • 20 commits
  • 16 files changed
  • 11 contributors

Commits on May 21, 2019

  1. Merge pull request #582 from puppetlabs/release 

    (MODULES-9109) Release mergeback v6.0.0
    @lionce
    lionce authored May 21, 2019
    Configuration menu
    Copy the full SHA
    9a2cfd8 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2019

  1. FM-8049 - add redhat8 support

    @lionce
    lionce committed May 23, 2019
    Configuration menu
    Copy the full SHA
    1a42f21 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #584 from lionce/FM-8049 

    FM-8049 - add redhat8 support
    @tphoney
    tphoney authored May 23, 2019
    Configuration menu
    Copy the full SHA
    9eae4a8 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2019

  1. (bugfix) allow private keys in ssh testing

    tphoney committed May 24, 2019
    Configuration menu
    Copy the full SHA
    e1cf441 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. Merge pull request #585 from tphoney/vagrant_fixes 

    (bugfix) allow private keys in ssh testing
    @florindragos
    florindragos authored May 28, 2019
    Configuration menu
    Copy the full SHA
    7548fd1 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. (maint) exit if travis setup fails

    tphoney committed May 30, 2019
    Configuration menu
    Copy the full SHA
    f3cfa09 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #586 from tphoney/travis_prescript 

    (maint) exit if travis setup fails
    @sheenaajay
    sheenaajay authored May 30, 2019
    Configuration menu
    Copy the full SHA
    18f8412 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. MODULES-9057 fix docs link

    @sheenaajay
    sheenaajay committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    faf1276 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #587 from puppetlabs/pdksync_pdksync-docsupdate 

    pdksync - MODULES-9057 Fix the module contribution guide link
    @tphoney
    tphoney authored Jun 5, 2019
    Configuration menu
    Copy the full SHA
    4af13ff View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. (FM-7709) pdksync and remove beaker

    tphoney committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    8ef0034 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #589 from tphoney/FM-7709 

    (FM-7709) pdksync and remove beaker
    carabasdaniel authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    c04bb88 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2019

  1. (MODULES-9482) Bump translate dependency upper range

    @eimlav
    eimlav committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    86eba78 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #590 from eimlav/pdksync_modules-9482 

    (MODULES-9482) Bump translate dependency upper range
    @lionce
    lionce authored Jul 3, 2019
    Configuration menu
    Copy the full SHA
    44ba701 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. Updated regex to allow for windows paths with \'s

    @pgrant87
    pgrant87 committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    9a36041 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. pdksync_heads/master-0-gb096033

    @lionce
    lionce committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    65544a8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #592 from puppetlabs/pdksync_pdksync_heads/master-… 

    …0-gb096033

pdksync - pdksync_heads/master-0-gb096033
    @tphoney
    tphoney authored Jul 16, 2019
    Configuration menu
    Copy the full SHA
    fca5ea8 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. Merge pull request #591 from pgrant87/master 

    (FM-8317) Updated regex to allow for windows paths with \'s
    @MartyEwings
    MartyEwings authored Jul 17, 2019
    Configuration menu
    Copy the full SHA
    00391c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2019

  1. (MODULES-9479) Fix nested array merge behavior (#593) 

    Thanks for the Input @seanmil 


* (MODULES-9479) Fix nested array merge behavior

Fix regression in behavior introduced in the 5.2.0 release
with the fix for MODULES-8287. Restore the behavior where arrays
nested inside hashes will be merged.

* Update to include newline in test

* Update "applies the manifest twice with no stderr"
    @seanmil @MartyEwings
    seanmil authored and MartyEwings committed Jul 19, 2019
    Configuration menu
    Copy the full SHA
    77be68e View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Release prep v6.1.0

    @lionce
    lionce committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    8f7f2ad View commit details
    Browse the repository at this point in the history

  2. Merge pull request #594 from lionce/prep_release 

    MODULES-9515 - Release v6.1.0
    @sheenaajay
    sheenaajay authored Jul 23, 2019
    Configuration menu
    Copy the full SHA
    e10a7a4 View commit details
    Browse the repository at this point in the history
Loading