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: 2.0.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.11.1
Choose a head ref
  • 10 commits
  • 12 files changed
  • 4 contributors

Commits on Sep 6, 2017

  1. (MODULES-5471) patch applied for 1.x series

    @eputnam
    eputnam committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    ad14a24 View commit details
    Browse the repository at this point in the history

  2. (MODULES-5471) release prep for 1.11.1

    @eputnam
    eputnam committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    7178982 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2017

  1. (MODULES-5471) apt dependency in spec_helper_acceptance 

    acceptance tests for 1.11.1 install the apt module for pagespeed and vhost tests. this version of the apache module is not compatible with modern versions of the apt module so this pins the apt module at version 2.4.0 (pre-puppet4) so that tests pass.
    @eputnam
    eputnam committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    ff38849 View commit details
    Browse the repository at this point in the history

  2. (MODULES-4883) pairing down tests for sles

    @eputnam
    tphoney authored and eputnam committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    e002247 View commit details
    Browse the repository at this point in the history

  3. (maint) adjust spec tests 

    Applied a fix from a little later in the commit history to fix a few tests. Removed pagespeed testing on rhel5 because the latest version of the mod no longer works with the native version of rpmlib.
    @eputnam
    eputnam committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    c90411a View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2017

  1. fix puppet 3 and ruby 1.9 errors 

    this module is not compatible with the newest concat so i explicitly set the concat version to a puppet3 one and then pinned some gems for ruby 193 compatibility
    @eputnam
    eputnam committed Sep 8, 2017
    Configuration menu
    Copy the full SHA
    d0e679f View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2017

  1. pin specinfra in the Gemfile

    @eputnam
    eputnam committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    34f63b2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1691 from eputnam/version1.11.1 

    (MODULES-5471, FM-6343) release prep for 1.11.1
    @HAIL9000
    HAIL9000 authored Sep 13, 2017
    Configuration menu
    Copy the full SHA
    27b4593 View commit details
    Browse the repository at this point in the history

  3. readme link fix [skip ci]

    @eputnam
    eputnam committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    fce5ae1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1694 from eputnam/version1.11.1 

    readme link fix [skip ci]
    Jean B authored Sep 13, 2017
    Configuration menu
    Copy the full SHA
    3d18643 View commit details
    Browse the repository at this point in the history
Loading