summaryrefslogtreecommitdiff
path: root/tests.as-root/system-overlap.script
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-14 10:22:46 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-14 10:22:46 +0000
commit8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (patch)
treed0d19252c154fb030f7dfa1c4784ef60e45bc40e /tests.as-root/system-overlap.script
parent2decdcdd27567e99e3bc53347d34064ab34f7932 (diff)
parentfbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (diff)
downloadmorph-8f8fc96b884e7f175d4a01bc2d91452d7149bf33.tar.gz
Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'
Reviewed-by: Sam Thursfield
Diffstat (limited to 'tests.as-root/system-overlap.script')
-rwxr-xr-xtests.as-root/system-overlap.script6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 41ff7536..c6154e0e 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,13 +35,9 @@ cat <<EOF >overlap-system.morph
"strata": [
{
"morph": "foo-baz-stratum",
- "repo": "test:morphs",
- "ref": "overlap"
},
{
"morph": "foo-barqux-stratum",
- "repo": "test:morphs",
- "ref": "overlap"
}
]
}