summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-05-06 13:07:38 -0400
committerMicah Anderson <micah@leap.se>2015-05-06 13:07:38 -0400
commit6a8a321ba50740181c27a6b9e8a82efd9edc3788 (patch)
tree41754ea15f1387f0d8d4773688eb6300311c9cd1
parent27833d50d8f26dd23ca7483ae6e6f2f255841454 (diff)
parent446da8fc1cdd3749ecb04ffcd7c8c035c051c373 (diff)
Merge branch '0.7.0' into develop
-rw-r--r--platform.rb2
-rw-r--r--provider_base/common.json4
m---------puppet/modules/apt0
3 files changed, 3 insertions, 3 deletions
diff --git a/platform.rb b/platform.rb
index 2f7b36eb..bb77b0d9 100644
--- a/platform.rb
+++ b/platform.rb
@@ -5,7 +5,7 @@
Leap::Platform.define do
self.version = "0.7"
- self.compatible_cli = "1.6.3".."1.99"
+ self.compatible_cli = "1.7.0".."1.7.99"
#
# the facter facts that should be gathered
diff --git a/provider_base/common.json b/provider_base/common.json
index 547acc80..c7be5cf4 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -53,9 +53,9 @@
},
"sources": {
"apt": {
- "basic": "http://http.debian.net/debian/",
+ "basic": "http://httpredir.debian.org/debian/",
"security": "http://security.debian.org/",
- "backports": "http://http.debian.net/debian/"
+ "backports": "http://httpredir.debian.org/debian/"
},
"leap-mx": {
"type": "apt",
diff --git a/puppet/modules/apt b/puppet/modules/apt
-Subproject 64fb988c0e37d64fb3e241dc95f156072e43bf2
+Subproject e8580d1da21d6f1024376d8bfa4858fe52acda6