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

Commits on Apr 22, 2015

  1. Update PE dependency in 1.4.x 

    PE < 3.7.0 binds to puppetlabs-concat 1.0.x, which is incompatible with
the vhost rewrite that was added in puppetlabs-apache 1.2.0.
    Morgan Haskel committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    4fe3694 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1105 from mhaskel/update_pe_dependency 

    Update PE dependency in 1.4.x
    @hunner
    hunner committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    95d17cf View commit details
    Browse the repository at this point in the history

  3. 1.4.1 prep

    Morgan Haskel committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    f2bf0aa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1106 from mhaskel/1.4.1-prep 

    1.4.1 prep
    @DavidS
    DavidS committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    bf64fc8 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2015

  1. Use concat 1.2.x

    @bmjen
    Morgan Haskel authored and bmjen committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    dbaac74 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1109 from bmjen/fix-unit-test 

    Use concat 1.2.x
    Morgan Haskel committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    87d7c65 View commit details
    Browse the repository at this point in the history

  3. Pin apt for the tests

    Morgan Haskel committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    fd23d10 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1110 from mhaskel/pin_apt 

    Pin apt for the tests
    @cmurphy
    cmurphy committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    34d5a2a View commit details
    Browse the repository at this point in the history
Loading