summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'baserock/richardmaw/fix-edit-build-depends'Sam Thursfield2013-02-136-36/+117
|\
| * Amend tests to trigger failure to recursively update strataRichard Maw2013-02-135-3/+51
| * morph edit: Recursively edit strataRichard Maw2013-02-131-33/+66
* | Merge branch 'liw/disable-test-on-squeeze'Lars Wirzenius2013-02-121-2/+9
|\ \
| * | Disable deployment test on Python 2.6Lars Wirzenius2013-02-121-2/+9
|/ /
* | Merge branch 'liw/deployment-fixes'Lars Wirzenius2013-02-122-2/+3
|\ \
| * | Improve message phrasingLars Wirzenius2013-02-121-2/+2
| * | Add missing "import sys" to fix error messagesLars Wirzenius2013-02-121-0/+1
|/ /
* | Merge branch 'liw/deployment-refactor' of git://git.baserock.org/baserock/bas...Richard Maw2013-02-1216-2/+995
|\ \
| * | Add missing argument to create_local_system methodLars Wirzenius2013-02-071-1/+1
| * | Refactor: Add WriteExtension.create_local_system methodLars Wirzenius2013-02-074-69/+52
| * | Remove debugging outputLars Wirzenius2013-02-073-29/+0
| * | Do away with unnecessary fstab entries for proc, sysLars Wirzenius2013-02-071-2/+0
| * | Let mount choose loop deviceLars Wirzenius2013-02-071-2/+1
| * | Create hole in-process without executing dd(1)Lars Wirzenius2013-02-071-7/+4
| * | Comment logic in _run_extensionLars Wirzenius2013-02-071-0/+3
| * | Make configuration-extensions have a default valueLars Wirzenius2013-02-072-12/+11
| * | Fix docstring and error messageLars Wirzenius2013-02-071-3/+3
| * | Describe how we re-use code from branch+merge pluginLars Wirzenius2013-02-071-0/+6
| * | Set PYTHONPATH during testsLars Wirzenius2013-02-061-0/+6
| * | Fix setup.py to also install deployment extensionsLars Wirzenius2013-02-061-0/+1
| * | Add cmdtest for "morph deploy" and rawdisk.writeLars Wirzenius2013-02-065-5/+278
| * | Add a write extension for kvm+libvirtLars Wirzenius2013-02-061-0/+140
| * | Add a write extension for VirtualBoxLars Wirzenius2013-02-061-0/+158
| * | Add a write extension for raw disk imagesLars Wirzenius2013-02-061-0/+70
| * | Add a configuration extension for setting hostnameLars Wirzenius2013-02-061-0/+27
| * | Add morphlib module for common write extension codeLars Wirzenius2013-02-063-0/+160
| * | Add deployment pluginLars Wirzenius2013-02-064-1/+203
| |/
* | Merge branch 'baserock/richardmaw/branch-from-image-v4'Sam Thursfield2013-02-1111-77/+455
|\ \
| * | git: clone then checkout instead of clone -bRichard Maw2013-02-111-1/+5
| * | Add a black-box test for branch-from-imageRichard Maw2013-02-113-0/+59
| * | branch and merge: add branch-from-image commandRichard Maw2013-02-111-0/+128
| * | branch and merge: combine checkout and branch logicRichard Maw2013-02-111-48/+37
| * | Make petrify more versatile than just making tagsRichard Maw2013-02-111-8/+18
| * | RepoAliasResolver: gimp logging during testsRichard Maw2013-02-111-0/+2
| * | RepoAliasResolver: Add aliases_from_url methodRichard Maw2013-02-112-0/+63
| * | repoaliasresolver: compile patterns on creationRichard Maw2013-02-112-19/+43
| * | Add a regression test for metadata including repo aliasRichard Maw2013-02-112-0/+97
| * | Make metadata include the repo-alias.Richard Maw2013-02-112-1/+3
|/ /
* | Merge remote-tracking branch 'origin/samthursfield/morph-name-equals-filename'Lars Wirzenius2013-02-113-90/+37
|\ \
| * | Remove test for name mismatchesSam Thursfield2013-02-081-66/+0
| * | Require morphology name to match filenameSam Thursfield2013-02-082-24/+37
| |/
* | Merge remote-tracking branch 'origin/baserock/richardmaw/safeyaml'Lars Wirzenius2013-02-111-4/+4
|\ \ | |/ |/|
| * yaml: use Safe Loaders and DumpersRichard Maw2013-02-111-4/+4
|/
* Merge remote-tracking branch 'remotes/origin/samthursfield/drive-by-fixes'Lars Wirzenius2013-02-064-45/+18
|\
| * Remove deprecated functionsSam Thursfield2013-02-061-24/+0
| * Avoid confusing error when staging area is emptySam Thursfield2013-02-061-2/+3
| * Tidy up create_cachedir()Sam Thursfield2013-02-062-19/+15
* | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-02-069-114/+153
|\ \ | |/
| * Merge branch 'liw/soft-pyyaml-dep'Sam Thursfield2013-01-297-112/+151
| |\
View Lorry Controller Status