diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:53:21 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:53:21 +0000 |
| commit | 6e36e9a1a29495f0c8b62fedddadcf8df78506d9 (patch) | |
| tree | 609fc24eaf3d9ac9ed14d6520cccae147a7f3907 /tests.merging/setup | |
| parent | c63bd810e953429b728adbadf60f10a08e6d4a06 (diff) | |
| parent | f4aaea23b7d80084504832d6b967a50c2d501b9e (diff) | |
| download | morph-6e36e9a1a29495f0c8b62fedddadcf8df78506d9.tar.gz | |
Merge remote-tracking branch 'origin/danielfirth/RT189'
Changed the error (exception) to list all obsolete fields.
Diffstat (limited to 'tests.merging/setup')
| -rwxr-xr-x | tests.merging/setup | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests.merging/setup b/tests.merging/setup index 11fdf0f1..2fdf9db0 100755 --- a/tests.merging/setup +++ b/tests.merging/setup @@ -51,9 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", "kind": "system", - "system-kind": "rootfs-tarball", "arch": "$(uname -m)", - "disk-size": "1G", "strata": [ { "morph": "hello-stratum", |