aboutsummaryrefslogtreecommitdiff
path: root/manifests/providers.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-01-02 19:15:34 +0100
committermh <mh@immerda.ch>2013-01-02 19:15:34 +0100
commit2f388687ea30fdefdcd405807a0fce699807809d (patch)
tree5d0449c901db61f753b6aa30b7c1d29fe0a0070b /manifests/providers.pp
parent5e555243c8dd93f7e5cfadacc9c3843d5f9d421c (diff)
parentc566c907a31b8142b2f2570210b9547c22af5326 (diff)
downloadpuppet-shorewall-2f388687ea30fdefdcd405807a0fce699807809d.tar.gz
puppet-shorewall-2f388687ea30fdefdcd405807a0fce699807809d.tar.bz2
Merge remote-tracking branch 'sarava/master'
Conflicts: manifests/base.pp manifests/init.pp
Diffstat (limited to 'manifests/providers.pp')
0 files changed, 0 insertions, 0 deletions