aboutsummaryrefslogtreecommitdiff
path: root/manifests/rules/libvirt/host.pp
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-11-11 23:10:20 +0100
committerintrigeri <intrigeri@boum.org>2012-11-11 23:10:20 +0100
commit8080f1a892a69dc171187c8165d7e81f5b5b512d (patch)
tree6e610ec18aaa13f7797eedd08b03c852e49d8cfb /manifests/rules/libvirt/host.pp
parent911cc18e594bb5a3ab642ebb24615a0447050c32 (diff)
parent5052233d92e97263eab292408ed2602db0836d98 (diff)
downloadpuppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.gz
puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.bz2
Merge remote-tracking branch 'riseup/master' into tmp
Conflicts: manifests/init.pp
Diffstat (limited to 'manifests/rules/libvirt/host.pp')
0 files changed, 0 insertions, 0 deletions