summaryrefslogtreecommitdiff
path: root/morph-cache-server.morph
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-09 14:04:37 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-09 14:04:37 +0100
commitc56b28e89558d5f5fd2a341c54286884d0c4b794 (patch)
tree8c5699b4677196705e117558aa8e269a0b510f3a /morph-cache-server.morph
parent939aaaeb4bd0d7ed96fb20d22619ed049e81937b (diff)
parentddf373bf3fe2f81609ba5356a006247d69d8c3e8 (diff)
downloadmorphs-c56b28e89558d5f5fd2a341c54286884d0c4b794.tar.gz
Merge remote-tracking branch 'origin/master' into rm/systemd
Diffstat (limited to 'morph-cache-server.morph')
-rw-r--r--morph-cache-server.morph7
1 files changed, 6 insertions, 1 deletions
diff --git a/morph-cache-server.morph b/morph-cache-server.morph
index 72c6ada..8a9285e 100644
--- a/morph-cache-server.morph
+++ b/morph-cache-server.morph
@@ -4,27 +4,32 @@
"sources": [
{
"name": "git",
+ "repo": "upstream:git",
"ref": "baserock/morph"
},
{
"name": "openssl",
+ "repo": "upstream:openssl",
"ref": "baserock/morph"
},
{
"name": "cpython",
+ "repo": "upstream:cpython",
"ref": "baserock/morph-2.7"
},
{
"name": "cliapp",
+ "repo": "upstream:cliapp",
"ref": "baserock/morph"
},
{
"name": "bottle",
- "repo": "defnull/bottle.git",
+ "repo": "upstream:defnull/bottle.git",
"ref": "master"
},
{
"name": "morph-cache-server",
+ "repo": "baserock:morph-cache-server",
"ref": "master"
}
]