summaryrefslogtreecommitdiff
path: root/puppet/modules/resolvconf
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-12-12 06:34:20 +0000
committervarac <varacanero@zeromail.org>2014-12-12 06:34:20 +0000
commitc85c1539b60ac26c86a17cd882129f49c2116564 (patch)
tree4c00cba26dd34b7c1c5b80bf1a9fbc0e850f9743 /puppet/modules/resolvconf
parentf5dc9ef60a0dd4d81ed594667cf66a2dc274e4d2 (diff)
parenta64b2081b872823f2d539b48151bc0d323b42453 (diff)
Merge branch 'bug/6542' into 'develop'
Bug/6542 See merge request !14
Diffstat (limited to 'puppet/modules/resolvconf')
0 files changed, 0 insertions, 0 deletions