summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-07-25 16:01:40 -0400
committerMicah Anderson <micah@leap.se>2013-07-26 14:10:56 -0400
commitc8922ffdf2ec8f459c4ed225329ea5fb634f4799 (patch)
tree11f4c5fab23084674e1f4788e2739b3bbb5f2564 /doc
parentd8a066a4307bea4c6dd6741daa250b67c92c1606 (diff)
parentf64791335e40b2b6e05305a6d8dda989fb755b9d (diff)
Merge branch 'varac/feature/mx' into feature/leap_mx
Conflicts: provider_base/services/mx.json puppet/manifests/site.pp puppet/modules/site_mx/manifests/init.pp puppet/modules/site_postfix/manifests/mx.pp Change-Id: Ib2952f6cb972c40a998f20d7bbdb23bb35bef419
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions