-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
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.8.0
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: puppetlabs/puppetlabs-apache
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.8.1
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 9 commits
- 11 files changed
- 4 contributors
Commits on Jan 28, 2016
-
Preserve /etc/httpd/conf.d/passenger.conf on EL7
mod_passenger provides a passenger.conf containing PassengerRoot to ensure the service starts up correctly. On EL7, this is installed at /etc/httpd/conf.d/passenger.conf and has been protected from purging since 005bf61. The change in 2a60859 to move LoadModule config files to /etc/httpd/conf.modules.d/ on EL7 also affected the path of the protected passenger.conf. This change reverts the path change to match the packages. In summary, prior to 2a60859 (release 1.7.0): - /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged) - /etc/httpd/conf.d/passenger_extra.conf with apache::mod::passenger settings - /etc/httpd/conf.d/zpassenger.load with LoadModule In 2a60859 (release 1.8.0): - /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings - /etc/httpd/conf.modules.d/zpassenger.load with LoadModule - /etc/httpd/conf.d/passenger.conf is purged With this commit: - /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings - /etc/httpd/conf.modules.d/zpassenger.load with LoadModule - /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged)
Dominic Cleal committedJan 28, 2016 3Configuration menu - View commit details
-
Copy full SHA for ecc2909 - Browse repository at this point
Copy the full SHA ecc2909View commit details -
Merge pull request #1345 from domcleal/1.8.x-13405-passengerroot-el7
Preserve /etc/httpd/conf.d/passenger.conf on EL7
Configuration menu - View commit details
-
Copy full SHA for 4d0c2b9 - Browse repository at this point
Copy the full SHA 4d0c2b9View commit details
Commits on Jan 29, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 4b0cd61 - Browse repository at this point
Copy the full SHA 4b0cd61View commit details -
Configuration menu - View commit details
-
Copy full SHA for e96a933 - Browse repository at this point
Copy the full SHA e96a933View commit details -
Merge pull request #1348 from bmjen/modules-3018
(MODULES-3018) Fixes apache to work correctly with concat.
Configuration menu - View commit details
-
Copy full SHA for 07cc69b - Browse repository at this point
Copy the full SHA 07cc69bView commit details
Commits on Feb 5, 2016
-
- Adds more default values for parameters. - Styles parameters and values more consistently. - Updates several broken or outdated external links. - Fixes broken internal links. - Replaces "define" (as a noun) with "defined type" for clarity. - Updates code fences from tildes to backticks. - Fixes mispelled references to `mod_auth_mellon`.
Configuration menu - View commit details
-
Copy full SHA for 28e0f3e - Browse repository at this point
Copy the full SHA 28e0f3eView commit details -
Merge pull request #1358 from gguillotte/18x-readme
1.8.x README revisions
Configuration menu - View commit details
-
Copy full SHA for c1d4e26 - Browse repository at this point
Copy the full SHA c1d4e26View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0806e59 - Browse repository at this point
Copy the full SHA 0806e59View commit details -
Configuration menu - View commit details
-
Copy full SHA for d76699a - Browse repository at this point
Copy the full SHA d76699aView commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 1.8.0...1.8.1