summaryrefslogtreecommitdiff
path: root/puppet/modules/resolvconf
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-03-09 17:40:11 +0100
committervarac <varacanero@zeromail.org>2016-03-09 17:40:11 +0100
commitbcd6bbeceee3fd4ad2082f46352d9f0813afa9ef (patch)
tree453b34cd26ccf7e56e002d19a39616d481e73bf8 /puppet/modules/resolvconf
parent0810e24d7b063c613a482fa04f43be89c6b38fb9 (diff)
parentee4fc33396aa52f9ec797fd431b3027d88fa1aa7 (diff)
Merge branch '2327_dont_recreate_nagios_resources' into develop
Diffstat (limited to 'puppet/modules/resolvconf')
0 files changed, 0 insertions, 0 deletions