diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-23 16:20:08 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-23 16:20:08 +0000 |
| commit | 8614b37bd70a0a9e1505a808442aa97147e04e96 (patch) | |
| tree | 7f237d68a0ba04c7ba8e1f7a9934297856cde067 /without-test-modules | |
| parent | 2089f74af895a4918670051e5d49188ed3b3f170 (diff) | |
| parent | 7c848e43fae1416578372f7a9bdf6e5c38770894 (diff) | |
| download | morph-8614b37bd70a0a9e1505a808442aa97147e04e96.tar.gz | |
Merge remote-tracking branch 'origin/tiagogomes/upgrades2'
Conflicts:
morphlib/exts/nfsboot.write
Sorted out the conflict, and tested by deploying first devel
and then base to the same rawdisk, and things worked.
Diffstat (limited to 'without-test-modules')
0 files changed, 0 insertions, 0 deletions