summaryrefslogtreecommitdiff
path: root/puppet/modules/common
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-06 11:09:45 +0100
committervarac <varacanero@zeromail.org>2012-11-06 11:09:45 +0100
commit1493ca871a596380f3db6feeb2c0621a597d4f30 (patch)
treeae5dda6dba81b77ca159cd1aa9e0bb32a13a3da7 /puppet/modules/common
parente6d9dca1e6c695e52f5052cb6877787e13bb0fb2 (diff)
parent7ca4f22e4cd76d986fece61674f487809d1369c6 (diff)
Merge branch 'feature/couchdb' into develop
Conflicts: puppet/modules/site_shorewall/manifests/eip.pp
Diffstat (limited to 'puppet/modules/common')
0 files changed, 0 insertions, 0 deletions