Merge remote-tracking branch 'origin/master'

funtoo · Nov 11, 2018 · 8020972 · 8020972
2 parents f3e0e36 + daa8172
commit 8020972
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/merge/config.py b/modules/merge/config.py
@@ -82,10 +82,10 @@ def kit_fixups(self):
 
 	@property
 	def gentoo_staging(self):
-		return self.get_option("sources", "gentoo-staging", "repos@git.funtoo.org:ports/gentoo-staging.git")
+		return self.get_option("sources", "gentoo-staging", "git@github.com:funtoo/gentoo-staging.git")
 
 	def base_url(self, repo):
-		base = self.get_option("destinations", "base_url", "repos@git.funtoo.org:kits/")
+		base = self.get_option("destinations", "base_url", "git@github.com:funtoo/")
 		if not base.endswith("/"):
 			base += "/"
 		return base + repo