| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | SSH Configuration Extension | Richard Holland | 2013-04-03 | 1 | -0/+141 | |
| | | | | | | | | | | | Added a configuration extension that copies SSH keys across to the deployed system. | |||||
| * | | Merge remote-tracking branch ↵ | Lars Wirzenius | 2013-04-04 | 1 | -1/+13 | |
| |\ \ | | | | | | | | | | | | | | | | 'remotes/origin/baserock/richardholland/expand-morph-deploy-help' Reformatted the text a bit. | |||||
| | * | | Expanded morph deploy help | Ric Holland | 2013-04-03 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | When too few arguments are given to morph deploy it points you to the help page, which contains no information about the number of arguments needed. This patch adds some information from the morph reference manual regarding the arguments needed for morph deploy. | |||||
| * | | | Merge remote-tracking branch ↵ | Lars Wirzenius | 2013-04-04 | 1 | -0/+5 | |
| |\ \ \ | |_|/ |/| | | | | | 'origin/baserock/danielsilverstone/add-tmpdir-for-deploy' | |||||
| | * | | Add TMPDIR to deploy extension environment | Daniel Silverstone | 2013-04-04 | 1 | -0/+5 | |
| |/ / | | | | | | | | | | | | | This adds TMPDIR to the environment of deployment extensions. It uses the --tempdir setting from morph in the case that TMPDIR is not already set. | |||||
| * | | Merge branch 'liw/ram-size' | Lars Wirzenius | 2013-03-28 | 3 | -6/+31 | |
| |\ \ | | | | | | | | | | Merging myself in the absence of the other reviewers. | |||||
| | * | | Set RAM size in VirtualBox deployments | Lars Wirzenius | 2013-03-28 | 1 | -1/+3 | |
| | | | | ||||||
| | * | | Set RAM size for kvm deployment | Lars Wirzenius | 2013-03-28 | 1 | -1/+4 | |
| | | | | ||||||
| | * | | Add method to parse $RAM_SIZE | Lars Wirzenius | 2013-03-28 | 1 | -4/+24 | |
| |/ / | ||||||
| * | | Merge branch 'liw/deploy-ext-in-system-morph-repo' | Lars Wirzenius | 2013-03-28 | 1 | -2/+6 | |
| |\ \ | | | | | | | | | | Merged with self-review, since everyone else is on holiday. | |||||
| | * | | Bug fix: use the right directory for the system morphology | Lars Wirzenius | 2013-03-27 | 1 | -2/+6 | |
| | |/ | | | | | | | | | | | Previously we used the system branch top directory, when we need the directory where the git repo for the system morphology is checked out. | |||||
| * | | Fix tests to match new output | Lars Wirzenius | 2013-03-27 | 3 | -3/+6 | |
| |/ | | | | Self-review. | |||||
| * | Merge branch 'baserock/richardholland/deploy-build-outside-system-branch-error' | Jonathan Maw | 2013-03-22 | 1 | -2/+7 | |
| |\ | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | Improved error message when building or deploying outside system branch | Ric Holland | 2013-03-22 | 1 | -2/+7 | |
| |/ | ||||||
| * | Merge branch 'baserock/richardholland/deploy-error-no-build' | Jonathan Maw | 2013-03-21 | 1 | -1/+5 | |
| |\ | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | Improved error message when when system has not been built before deploy | Ric Holland | 2013-03-20 | 1 | -1/+5 | |
| |/ | ||||||
| * | Fix condition for showing the staging-filler warning | Lars Wirzenius | 2013-03-20 | 1 | -1/+1 | |
| | | | | | | | | If there is no staging-filler setting in a configuration file, it defaults to the empty string, not None. Reviewed-by: Jonathan Maw over the shoulder | |||||
| * | Merge branch 'liw/detabify' | Lars Wirzenius | 2013-03-20 | 2 | -3/+4 | |
| |\ | | | | | | | | | | | (I am not going through the normal patch review process for this.) Reviewed-by: Lars Wirzenius | |||||
| | * | Break long source line | Lars Wirzenius | 2013-03-20 | 1 | -1/+2 | |
| | | | ||||||
| | * | Replace spaces with tabs | Lars Wirzenius | 2013-03-20 | 1 | -2/+2 | |
| |/ | ||||||
| * | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph | Lars Wirzenius | 2013-03-20 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge branch 'liw/check-fix' | Jonathan Maw | 2013-03-20 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | | * | Use a relative symlink in test chunk | Lars Wirzenius | 2013-03-20 | 1 | -1/+1 | |
| | |/ | | | | | | | | | | | The absolute one made the test suite fail in my VM, and is not the right thing to do anyway. $DESTDIR/usr/bin and $DESTDIR/bin are meant to be the same directory here, not $DESTDIR/usr/bin and /bin. | |||||
| * | | Merge remote-tracking branch 'origin/jonathan/copy-artifacts-plugin' | Lars Wirzenius | 2013-03-20 | 3 | -67/+107 | |
| |\ \ | |/ |/| | ||||||
| | * | Remove obsolete script | Jonathan Maw | 2013-03-14 | 1 | -67/+0 | |
| | | | ||||||
| | * | Acknowledge the lack of test coverage | Jonathan Maw | 2013-03-14 | 2 | -0/+5 | |
| | | | ||||||
| | * | Add copy-artifacts-plugin.py | Jonathan Maw | 2013-03-14 | 1 | -0/+102 | |
| | | | ||||||
| * | | Merge branch 'baserock/richardholland/git-config-check' | Jonathan Maw | 2013-03-20 | 2 | -0/+5 | |
| |\ \ | | | | | | | | | | Reviwed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | | check now uses git config file in morph/scripts | Ric Holland | 2013-03-20 | 2 | -0/+5 | |
| |/ / | | | | | | | | | To remove need of configuring git to check new system .gitconfig file added to morph/scripts and check set to use this file. | |||||
| * | | Merge branch 'baserock/richardholland/shorten-build-errors' | Jonathan Maw | 2013-03-20 | 1 | -1/+7 | |
| |\ \ | | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | | Added exception to give smaller error message | Ric Holland | 2013-03-20 | 1 | -1/+7 | |
| |/ / | ||||||
| * | | Merge branch 'baserock/richardholland/stop-morph-logging-gitmodule-error' | Jonathan Maw | 2013-03-20 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | | Changed the error message in log when morph fails to find gitmodules | Ric Holland | 2013-03-20 | 1 | -1/+1 | |
| |/ / | | | | | | | morph.log will now show an INFO message rther than a ERROR | |||||
| * | | Merge branch 'samthursfield/staging-filler-warning' | Jonathan Maw | 2013-03-20 | 1 | -1/+5 | |
| |\ \ | | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | | Warn if staging fillers are used | Sam Thursfield | 2013-03-20 | 1 | -1/+5 | |
| |/ / | | | | | | | | | The 'master' branch of baserock:baserock/morphs no longer requires a staging filler. | |||||
| * | | Merge branch 'liw/attach_disks' | Jonathan Maw | 2013-03-20 | 3 | -2/+27 | |
| |\ \ | | | | | | | | | | Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | | Implement ATTACH_DISKS in virtualbox-ssh.write | Lars Wirzenius | 2013-03-20 | 1 | -1/+11 | |
| | | | | ||||||
| | * | | Add ATTACH_DISKS support to kvm | Lars Wirzenius | 2013-03-20 | 2 | -1/+16 | |
| |/ / | ||||||
| * | | Merge branch 'ps/prettier-log' | Sam Thursfield | 2013-03-18 | 2 | -9/+13 | |
| |\ \ | ||||||
| | * | | Fix long lines | Sam Thursfield | 2013-03-18 | 2 | -4/+8 | |
| | | | | ||||||
| | * | | show commit we want to build for each chunk | Paul Sherwood | 2013-03-17 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | add short sha1 for each actual build line in log | Paul Sherwood | 2013-03-16 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | make logs prettier - put chunkname after buildnumber in most cases | Paul Sherwood | 2013-03-16 | 1 | -7/+7 | |
| |/ / | ||||||
| * | | Merge branch ↵ | Jonathan Maw | 2013-03-15 | 2 | -3/+10 | |
| |\ \ | | | | | | | | | | | | | | | | 'baserock/richardholland/add-metadata-dir-setting-to-branch-from-image' Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk> | |||||
| | * | | Changed test script to agree with changes made to branch-from-image | Ric Holland | 2013-03-14 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Changed metadata_dir from an optional argument to a setting | Ric Holland | 2013-03-14 | 1 | -2/+9 | |
| | | | | | | | | | | | | | morph branch-from-image | |||||
| * | | | Fix long line | Sam Thursfield | 2013-03-15 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Merge branch 'samthursfield/arch' | Sam Thursfield | 2013-03-15 | 16 | -157/+172 | |
| |\ \ \ | | | | | | | | | | | | | Reviewed-By: concensus | |||||
| | * | | | Update Morph man page regarding environment variables | Sam Thursfield | 2013-03-15 | 1 | -39/+20 | |
| | | | | | ||||||
| | * | | | Change hardcoded cache key in test | Sam Thursfield | 2013-03-15 | 1 | -1/+1 | |
| | | | | | ||||||
 |
index : baserock/baserock/morph.git | |
| Morph -- Baserock build tool |
| summaryrefslogtreecommitdiff |