summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-12 11:14:32 -0500
committerMicah Anderson <micah@riseup.net>2013-02-12 11:14:32 -0500
commit05b4a4d9d6ddb594ffa900192ad0ad714957663f (patch)
tree2a24f3b6ecf55e8f8265cf7b9aa0e86c5563638b /provider_base
parent1a2789d084c3c2beccb97726b8799cb194a634fd (diff)
parent102af94df02decef888bac09748dbac6773dedd6 (diff)
Merge remote-tracking branch 'origin/develop' into bundle-and-precompile-as-user
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/provider.json3
1 files changed, 0 insertions, 3 deletions
diff --git a/provider_base/provider.json b/provider_base/provider.json
index 0eae1f87..8ce848f3 100644
--- a/provider_base/provider.json
+++ b/provider_base/provider.json
@@ -26,8 +26,5 @@
"life_span": "1y"
}
},
- "vagrant":{
- "network":"10.5.5.0/24"
- },
"hiera_sync_destination": "/etc/leap"
}