]> gitweb.fluxo.info Git - puppet-nginx.git/commitdiff
projects / puppet-nginx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0d9ca4 f2a3556)
Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-nginx
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 17 Feb 2010 20:29:20 +0000 (18:29 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 17 Feb 2010 20:29:20 +0000 (18:29 -0200)
1  2 
manifests/init.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/init.pp
Simple merge
Puppet module for nginx