comparison hiera.yaml @ 57:3674aac72674 puppet-3.6

Merge Default changes to Puppet 3.6 and fix conflict
author IBBoard <dev@ibboard.co.uk>
date Sun, 26 Jul 2015 17:55:43 +0100
parents 204330fea19a
children ea72ea1f7320
comparison
equal deleted inserted replaced
56:2c1e222300f6 57:3674aac72674