]> gitweb.fluxo.info Git - puppet-bind.git/commitdiff
projects / puppet-bind.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 999e4e4 88a3966)
Merge branch 'master' of https://github.com/camptocamp/puppet-bind
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 20 Jan 2013 23:24:54 +0000 (21:24 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 20 Jan 2013 23:24:54 +0000 (21:24 -0200)
Conflicts:
manifests/definitions/bind-mx.pp


Trivial merge
Puppet module for bind