summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/liw/cachedrepo-unit-test-fix-v2-rebase'Lars Wirzenius2013-10-243-7/+17
|\ \ \ | |/ / |/| |
| * | Fix app.status call in log_dict_diffLars Wirzenius2013-10-241-2/+4
| * | Make CachedRepo.resolve_ref handle non-existent SHA1Lars Wirzenius2013-10-241-4/+9
| * | Fix CachedRepo.resolve_ref unit test for missing SHA1Lars Wirzenius2013-10-231-1/+4
* | | Merge branch 'baserock/richardmaw/bugfix/null-build-without-push' of git://gi...Richard Maw2013-10-171-2/+2
|\ \ \ | |/ / |/| |
| * | build-without-push: Handle null repo/refRichard Maw2013-10-141-2/+2
* | | Merge branch 'danielfirth/S9121'Daniel Firth2013-10-153-3/+10
|\ \ \ | |/ / |/| |
| * | Deployment failures will now remove the disk imageDan Firth2013-10-143-3/+10
| |/
* | Reduced debug output for environment propertiesDan Firth2013-10-141-1/+2
* | Merge branch 'danielfirth/RT193'Daniel Firth2013-10-116-14/+21
|\ \
| * | Added chunkname prefix to some elements of the debug log.Dan Firth2013-10-116-14/+21
| |/
* | Merge branch 'danielfirth/RT219'Daniel Firth2013-10-113-8/+10
|\ \
| * | Morph now executes extensions in the repository containing the morphologiesDaniel Firth2013-09-263-8/+10
* | | Merge remote-tracking branch 'remotes/origin/danielfirth/RT174'Lars Wirzenius2013-10-101-1/+1
|\ \ \
| * | | Changed 'figuring out the right build order' to 'Computing artifact graph'Daniel Firth2013-10-071-1/+1
| | |/ | |/|
* | | Remove TAB charactersLars Wirzenius2013-10-101-2/+2
* | | Merge branch 'danielfirth/RT240'Daniel Firth2013-10-101-0/+14
|\ \ \
| * | | Morph now validates the 'tarball-server' option as a urlDaniel Firth2013-10-101-0/+14
| |/ /
* | | Merge remote-tracking branch 'origin/baserock/richardipsum'Lars Wirzenius2013-10-083-2/+48
|\ \ \
| * | | Fix bug in autotools versionRichard Ipsum2013-10-081-2/+3
| * | | Add yarn test for autotools version guesserRichard Ipsum2013-10-082-0/+43
| |/ /
* | | Merge remote-tracking branch 'origin/danielfirth/RT241'Lars Wirzenius2013-10-082-2/+6
|\ \ \
| * | | Added 'description' field to static defaults for cluster morphologiesDan Firth2013-10-072-2/+6
| |/ /
* | | Merge remote-tracking branch 'origin/danielfirth/RT189'Lars Wirzenius2013-10-0829-207/+64
|\ \ \
| * | | Re-enabled validation for morph editDan Firth2013-10-011-10/+0
| * | | 'system-kind' and 'disk-size' system morphology fields now raise ObsoleteFiel...Dan Firth2013-10-012-0/+39
| * | | Dropped support for 'system-kind' from system morphology filesDan Firth2013-09-2727-124/+20
| * | | Dropped support for 'disk-size' from system morphology files'Dan Firth2013-09-2715-79/+10
| | |/ | |/|
* | | Fix test suite to work with current gitLars Wirzenius2013-10-082-5/+5
| |/ |/|
* | Add NEWS filebaserock-11Jonathan Maw2013-10-011-0/+9
* | Merge branch 'baserock/richardmaw/S8847/branch-from-image-v3'Jonathan Maw2013-09-306-47/+313
|\ \
| * | B&M: refactor branch-from-imageRichard Maw2013-09-253-11/+108
| * | morphlib: Add SystemMetadataDir classRichard Maw2013-09-253-0/+163
| * | b&m: checkout and branch use context managerRichard Maw2013-09-251-36/+7
| * | b&m: Add system branch initializing context managerRichard Maw2013-09-251-0/+35
* | | Merge remote-tracking branch 'origin/baserock/richardmaw/S8938/null-repo-ref'Lars Wirzenius2013-09-3013-13/+204
|\ \ \ | |_|/ |/| |
| * | Add tests for building and deploying systems with null refsRichard Maw2013-09-263-0/+82
| * | Move helper script to scripts for use in cmdtestsRichard Maw2013-09-262-17/+19
| * | Make branch commands work with null refsRichard Maw2013-09-265-4/+106
| * | Allow building with null repo/refRichard Maw2013-09-264-9/+14
|/ /
* | Merge branch 'baserock/larswirzenius/S8698-morph-help-fmt'Lars Wirzenius2013-09-251-0/+25
|\ \ | |/ |/|
| * Avoid formatting "morph help foo" outputLars Wirzenius2013-09-241-0/+25
* | Merge branch 'baserock/richardmaw/S8957/build-after-petrify-regression-test'Richard Maw2013-09-253-2/+33
|\ \
| * | tests.branching: Add build after petrify testRichard Maw2013-09-241-0/+31
| * | tests.branching: Make defined systems buildableRichard Maw2013-09-242-2/+2
|/ /
* | Merge branch 'jonathan/fix-cross-bootstrap-rebase'Jonathan Maw2013-09-241-7/+14
|\ \
| * | Make cross-bootstrap successfully build everythingJonathan Maw2013-09-241-7/+14
|/ /
* | Merge branch 'baserock/richardmaw/S8847/cleanup-petrify-v3'Richard Maw2013-09-244-69/+215
|\ \ | |/ |/|
| * b&m: Use new MorphSet api in unpetrifyRichard Maw2013-09-241-23/+1
| * MorphSet: add unpetrify_all() methodRichard Maw2013-09-242-0/+27