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-inifile
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.3.0
Choose a base ref
...
head repository: puppetlabs/puppetlabs-inifile
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.4.0
Choose a head ref
  • 17 commits
  • 9 files changed
  • 9 contributors

Commits on Jun 9, 2015

  1. (maint) allow setting PUPPET_VERSION in acceptance

    @justinstoller
    justinstoller committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    9a7c0f3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #164 from justinstoller/maint/master/set-puppet-ve… 

    …rsion

(maint) allow setting PUPPET_VERSION in acceptance
    @DavidS
    DavidS committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    bb67906 View commit details
    Browse the repository at this point in the history

  3. Correct the date and metadata ordering

    Morgan Haskel committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    30ee205 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #165 from mhaskel/merge_1.3.x_to_master 

    Correct the date and metadata ordering
    @bmjen
    bmjen committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    485c839 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2015

  1. Add helper to install puppet/pe/puppet-agent

    @hunner
    hunner committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    6acf750 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #166 from hunner/add_helper 

    Add helper to install puppet/pe/puppet-agent
    @bmjen
    bmjen committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    62a31ba View commit details
    Browse the repository at this point in the history

  3. Update the gemfile for puppet install helper

    @hunner
    hunner committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    034233f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #167 from puppetlabs/update_gemfile 

    Update the gemfile for puppet install helper
    @bmjen
    bmjen committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    e89bf76 View commit details
    Browse the repository at this point in the history

  5. Correct the name of the require

    @hunner
    hunner committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    3c92a35 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #168 from hunner/fix_helper_name 

    Correct the name of the require
    @bmjen
    bmjen committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    e132445 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2015

  1. MODULES-1599 Match only on space and tab whitespace after k/v separator 

    The previous match for \s would also match on newlines.  This caused
existing settings with blank values to have the newline considered part
of the whitespace surrounding the separator.  When such settings are
set with a value, the value ends up on the next line.

Also adding acceptance test for this particular situation.
    Mike Dorman committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    c784253 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2015

  1. Add support for Solaris 12

    Drew Fisher committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    366523b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #171 from misterdorm/bug1599 

    MODULES-1599 Match only on space and tab whitespace after k/v separator
    Morgan Haskel committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    a09bfef View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2015

  1. Merge pull request #172 from drewfisher314/ticket/2136-add-solaris-12 

    Add support for Solaris 12
    @jonnytdevops
    jonnytdevops committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    bf32ac8 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. Release Prep 1.4.0

    @jonnytdevops
    jonnytdevops committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    101519d View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Bump version for release

    @hunner
    hunner committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    b369841 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #175 from hunner/bump_version 

    Bump version for release
    Morgan Haskel committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    7543b3c View commit details
    Browse the repository at this point in the history
Loading