summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| |\
| | * Make yaml be an optional dependencyLars Wirzenius2013-01-297-111/+151
| * | scripts/bootstrap: Fix eglibc2 buildSam Thursfield2013-01-291-1/+1
| * | Fix copyright yearSam Thursfield2013-01-291-1/+1
* | | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-01-291-2/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'samthursfield/no-distcc'Sam Thursfield2013-01-291-2/+3
| |\ |/ /
| * Disable distcc by defaultSam Thursfield2013-01-291-2/+3
|/
* Fix cwd parsing in setup.pyLars Wirzenius2013-01-291-1/+2
* Merge branch 'jjardon/yaml-v2'Sam Thursfield2013-01-2818-129/+314
|\
| * Remove unneded json module importsJavier Jardón2013-01-284-9/+3
| * Change build tests to use YAML morphologiesJavier Jardón2013-01-285-96/+64
| * Fix testsRichard Maw2013-01-223-5/+89
| * Parse as YAML if not valid JSONRichard Maw2013-01-225-9/+147
| * Move OrderedDict and json loading to morphlib.utilRichard Maw2013-01-222-11/+12
* | Merge remote-tracking branch 'origin/baserock/richardmaw/morph-version'Lars Wirzenius2013-01-287-7/+216
|\ \
| * | Add regression test for metadata including versionRichard Maw2013-01-282-0/+100
| * | Include morph-version in artifact metadataRichard Maw2013-01-281-0/+7
| * | Make morph get its version from git.Richard Maw2013-01-284-7/+109
| |/
* | Merge remote-tracking branch 'origin/baserock/richardmaw/temp-build-ref-commi...Lars Wirzenius2013-01-282-3/+61
|\ \
| * | Add test for committed removes being trackedRichard Maw2013-01-251-0/+56
| * | Make temporary build refs count changes against HEADRichard Maw2013-01-251-3/+4
| |/
* | Fix copyright yearSam Thursfield2013-01-281-1/+1
* | Merge remote-tracking branch 'origin/samthursfield/build-essential'Lars Wirzenius2013-01-282-0/+558
|\ \ | |/ |/|
| * Run ldconfig after populating staging chrootSam Thursfield2013-01-241-0/+3
| * Add script to manually create a build-essential staging fillerSam Thursfield2013-01-241-0/+553
|/
* Remove scripts/clean-git-cacheSam Thursfield2013-01-221-240/+0