Skip to content

Fix Debian configuration #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 22, 2013
Merged

Fix Debian configuration #42

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86136d8
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Sep 10, 2013
6d21cb4
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Sep 16, 2013
8463b1d
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Oct 4, 2013
69cb89b
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Oct 17, 2013
51b43d7
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Oct 21, 2013
5a34ea2
Add test to prevent breaking the main conf
javierbertoli Oct 22, 2013
ffcb5e2
Add all of Debian's config dirs to the main config file
javierbertoli Oct 22, 2013
9760b62
Merge branch 'upstreams_conf_issue'
javierbertoli Oct 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/example42/puppet-nginx
  • Loading branch information
@javierbertoli
javierbertoli committed Oct 21, 2013
commit 51b43d73cae82761dbf48b973a8f7277e1fd262d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.