summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'baserock/tiagogomes/ssh-rsync-work' of ssh://git.baserock.org/b...Tiago Gomes2013-07-011-70/+80
|\
| * Improvements to ssh-rsync extensionTiago Gomes2013-07-011-70/+80
|/
* Merge branch 'baserock/richardmaw/S8041/update-README' of git://git.baserock....Richard Maw2013-06-271-103/+85
|\
| * Update build environment descriptionRichard Maw2013-06-271-1/+6
| * Augment instructions for running morph's testsRichard Maw2013-06-271-1/+4
| * Remove disk-size field from manual.Richard Maw2013-06-271-2/+0
| * Fix typoRichard Maw2013-06-271-1/+1
| * List more build systems.Richard Maw2013-06-271-2/+9
| * Rewrite morphologies in YAMLRichard Maw2013-06-271-84/+53
| * Update build instructionsRichard Maw2013-06-271-11/+11
| * re-brand ourselves as an appliance Linux solutionRichard Maw2013-06-271-1/+1
|/
* Merge remote-tracking branch 'origin/baserock/tiagogomes/bscs-sync'Richard Maw2013-06-251-4/+13
|\
| * Run the merge mode of baserock-system-config-sync when upgrading running syst...Tiago Gomes2013-06-171-0/+9
| * Add a missing trailing slash to the source directory of rsyncTiago Gomes2013-06-171-1/+2
| * Unmount the remote mouting point instead of the root diskTiago Gomes2013-06-151-1/+1
| * Don't dereference the default symbolic link when updating itTiago Gomes2013-06-151-2/+1
| * Fix warnings and test suiteLars Wirzenius2013-06-153-20/+14
| * Remove SystemKindBuilderFactoryLars Wirzenius2013-06-153-133/+52
| * Require system-kind to be rootfs-tarballLars Wirzenius2013-06-151-0/+3
| * Delete system-kind plugins except for rootfs-tarballLars Wirzenius2013-06-153-284/+0
| * Check that that the repo-alias option matches the expected RERichard Dale2013-06-151-0/+4
* | Merge remote-tracking branch 'origin/baserock/richarddale/config-messages-ver...Lars Wirzenius2013-06-253-8/+20
|\ \
| * | Fix lines overflowing the 80 character limitRichard Dale2013-06-252-5/+10
| * | Don't show git config messages for 'morph branch' in verbose modeRichard Dale2013-06-253-8/+15
|/ /
* | Merge remote-tracking branch 'origin/baserock/richardmaw/fix-artifact-gc'Lars Wirzenius2013-06-211-1/+2
|\ \
| * | Only attempt to clean up artifactsRichard Maw2013-06-111-1/+2
|/ /
* | deploy plugin: Use sh instead of bash for timestampingRichard Maw2013-06-111-1/+1
* | Merge remote-tracking branch 'origin/baserock/richardmaw/S8043-timestamp-exte...Lars Wirzenius2013-06-202-1/+4
|\ \
| * | Write extensions: Flush output when using status()Richard Maw2013-06-101-0/+1
| * | deploy_plugin: Timestamp output of extensionsRichard Maw2013-06-101-1/+3
* | | Merge branch 'liw/os-release-perms'Lars Wirzenius2013-06-201-2/+4
|\ \ \
| * | | Fix permissions of /etc/os-releaseLars Wirzenius2013-06-201-2/+4
|/ / /
* | | Merge branch 'liw/remove-nonrootfs-system-kinds'Lars Wirzenius2013-06-207-430/+62
|\ \ \ | |/ / |/| |
| * | Fix warnings and test suiteLars Wirzenius2013-06-203-20/+14
| * | Remove SystemKindBuilderFactoryLars Wirzenius2013-06-203-133/+52
| * | Require system-kind to be rootfs-tarballLars Wirzenius2013-06-201-0/+3
| * | Delete system-kind plugins except for rootfs-tarballLars Wirzenius2013-06-203-284/+0
|/ /
* | Merge remote-tracking branch 'origin/baserock/richarddale/check-repo-alias-op...Daniel Silverstone2013-06-191-0/+4
|\ \ | |/ |/|
| * Check that that the repo-alias option matches the expected RERichard Dale2013-06-171-0/+4
* | Merge branch 'baserock/richardmaw/S8131-deploy-with-spaces' of git://git.base...Richard Maw2013-06-193-6/+6
|\ \
| * | Write extensions: pass -s to rsyncRichard Maw2013-06-093-6/+6
|/ /
* | Merge branch 'jonathan/kvm-nic'Jonathan Maw2013-06-191-0/+5
|\ \
| * | kvm.write uses NIC_CONFIGJonathan Maw2013-06-191-0/+5
|/ /
* | Fix a typoTiago Gomes2013-06-191-1/+1
* | GC Plugin: Fix usage of satus.Richard Maw2013-06-091-1/+1
* | Merge remote-tracking branch 'origin/symb-link-running-systems'Lars Wirzenius2013-06-192-6/+19
|\ \
| * | Support upgrades in older running versions.Tiago Gomes2013-06-141-3/+11
| * | Create a symbolic link to the default system version when upgrading running s...Tiago Gomes2013-06-141-2/+6
| * | Only upgrade an older extlinux configuration if we want one.Tiago Gomes2013-06-141-1/+2
* | | Merge branch 'baserock/richardmaw/S7905-morph-gc-v3' of git://git.baserock.or...Richard Maw2013-06-095-8/+248
|\ \ \ | |/ / |/| |