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: 2.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: 2.0.1
Choose a head ref
  • 11 commits
  • 10 files changed
  • 4 contributors

Commits on May 27, 2015

  1. Configuration menu
    Copy the full SHA
    2292759 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #317 from bmjen/tableflip

    MODULES-2054 - fixes dependency bug in creating the target file
    Morgan Haskel committed May 27, 2015
    Configuration menu
    Copy the full SHA
    02c5f4b View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. fix fragment target handling

    Needed to bind fragment targets to it's parent concat resource's title so that we can
    find them in the catalog. Throws a warning if the target is not found.
    bmjen committed May 28, 2015
    Configuration menu
    Copy the full SHA
    db33829 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #318 from bmjen/frag-targeting

    fix fragment target handling
    Morgan Haskel committed May 28, 2015
    Configuration menu
    Copy the full SHA
    e9ee044 View commit details
    Browse the repository at this point in the history
  3. adds file autorequire

    autorequire will add parent directories of the concat_file to the dependency chain.
    So they can be created in the right order if they do not exist.
    bmjen committed May 28, 2015
    Configuration menu
    Copy the full SHA
    78fdb4e View commit details
    Browse the repository at this point in the history

Commits on May 29, 2015

  1. fix defaulted force behavior

    With Concat 2.0.x we've deprecated the -force parameter and the resulting bug
    caused concat files that have no content/fragments to overwrite the target file with an
    empty file. Concat should only create an empty file if no file exists, and if the file
    exists, then it should not overwrite it with an empty file.
    bmjen committed May 29, 2015
    Configuration menu
    Copy the full SHA
    64b9288 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #319 from bmjen/add-file-autorequire

    adds file autorequire
    cyberious committed May 29, 2015
    Configuration menu
    Copy the full SHA
    6264171 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #321 from bmjen/empty-concats

    fix defaulted force behavior
    cyberious committed May 29, 2015
    Configuration menu
    Copy the full SHA
    ddcf87f View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2015

  1. 1.2.3 Release prep

    bmjen committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    5267d35 View commit details
    Browse the repository at this point in the history
  2. Release 2.0.1 prep

    bmjen committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    d6ee5a8 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #325 from bmjen/2.0.1_prep

    2.0.1 prep
    hunner committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    75d1e96 View commit details
    Browse the repository at this point in the history
Loading