James Fryman 7ea6b570c3 Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management ... Conflicts: manifests/init.pp manifests/package.pp manifests/params.pp		2013-10-07 14:46:42 -05:00
..
package	Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management	2013-10-07 14:46:42 -05:00
resource	possibility to disable default location	2013-09-29 20:53:25 +02:00
config.pp	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-09-08 16:50:16 +04:00
init.pp	Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management	2013-10-07 14:46:42 -05:00
package.pp	Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management	2013-10-07 14:46:42 -05:00
params.pp	Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management	2013-10-07 14:46:42 -05:00
service.pp	linting	2013-05-08 14:15:42 +02:00