summaryrefslogtreecommitdiff
path: root/puppet/modules/site_haproxy/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-03-15 10:24:20 +0100
committervarac <varacanero@zeromail.org>2014-03-15 10:24:20 +0100
commit49ab166fbe013da6de301a7bb8d1a5128207c3b5 (patch)
tree61234b2f1f49fbcfb00ef993a3c25823bbc604fe /puppet/modules/site_haproxy/manifests
parent2f1b09caa23d74b3b778dd285a3456c142d052f8 (diff)
parent18121335c200b86a39f83a7cd240258c40a81f4e (diff)
Merge remote-tracking branch 'elijah/feature/provider-env' into 0.6
Diffstat (limited to 'puppet/modules/site_haproxy/manifests')
0 files changed, 0 insertions, 0 deletions