summaryrefslogtreecommitdiff
path: root/puppet/modules/site_mx/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-07-14 15:44:33 +0200
committervarac <varacanero@zeromail.org>2015-07-14 15:44:33 +0200
commit75b2a9693832c266d8b893aa1de4f6da8e924400 (patch)
treef094108df6b2a02ad03959c9f5b6593545e1caae /puppet/modules/site_mx/manifests
parent2adbf36f656b68ef09f1d6dafdc9f1b8f99d8080 (diff)
parent2bb4f3d3c350aaac569f0c6a8c7935f4c35ecfee (diff)
Merge remote-tracking branch 'yuvipanda/vagrant-fixes' into develop
Conflicts: Vagrantfile Change-Id: I0500e0deb7697ff39a7856878c5e6e867c633469
Diffstat (limited to 'puppet/modules/site_mx/manifests')
0 files changed, 0 insertions, 0 deletions