summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disable make-patch test, since make-patch is brokenLars Wirzenius2013-04-232-7/+6
* Fix tests to use rootfs-tarball system-kinds, instead of disksLars Wirzenius2013-04-2314-26/+26
* Merge remote-tracking branch 'origin/baserock/richardholland/empty-stratum-er...Lars Wirzenius2013-04-124-1/+47
|\
| * Corrections to previous commitsRichard Holland2013-04-082-3/+3
| * Added new test case for empty strataRichard Holland2013-04-083-0/+40
| * Changed empty stratum warning to errorRichard Holland2013-04-081-1/+7
* | Fix copyright yearLars Wirzenius2013-04-121-1/+1
* | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-04-121-3/+3
|\ \
| * | Fix nfsboot write-extensionJonathan Maw2013-04-081-3/+3
| |/
* | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-04-082-0/+193
|\ \ | |/
| * Merge branch 'jonathanmaw/deploy-nfsboot-rebase-3'Jonathan Maw2013-04-052-0/+193
| |\
| | * Add nfsboot write extensionJonathan Maw2013-04-051-0/+161
| | * Add nfsboot configuration extensionJonathan Maw2013-04-051-0/+32
| |/
* | Merge remote-tracking branch 'origin/baserock/richardholland/ssh-config-ext'Lars Wirzenius2013-04-052-0/+145
|\ \ | |/ |/|
| * Fixed error SSH configuration extensionRichard Holland2013-04-041-6/+8
| * Added status output to print out running extensionRichard Holland2013-04-031-0/+2
| * SSH Configuration ExtensionRichard Holland2013-04-031-0/+141
* | Merge remote-tracking branch 'remotes/origin/baserock/richardholland/expand-m...Lars Wirzenius2013-04-041-1/+13
|\ \
| * | Expanded morph deploy helpRic Holland2013-04-031-1/+7
* | | Merge remote-tracking branch 'origin/baserock/danielsilverstone/add-tmpdir-fo...Lars Wirzenius2013-04-041-0/+5
|\ \ \ | |_|/ |/| |
| * | Add TMPDIR to deploy extension environmentDaniel Silverstone2013-04-041-0/+5
|/ /
* | Merge branch 'liw/ram-size'Lars Wirzenius2013-03-283-6/+31
|\ \
| * | Set RAM size in VirtualBox deploymentsLars Wirzenius2013-03-281-1/+3
| * | Set RAM size for kvm deploymentLars Wirzenius2013-03-281-1/+4
| * | Add method to parse $RAM_SIZELars Wirzenius2013-03-281-4/+24
|/ /
* | Merge branch 'liw/deploy-ext-in-system-morph-repo'Lars Wirzenius2013-03-281-2/+6
|\ \
| * | Bug fix: use the right directory for the system morphologyLars Wirzenius2013-03-271-2/+6
| |/
* | Fix tests to match new outputLars Wirzenius2013-03-273-3/+6
|/
* Merge branch 'baserock/richardholland/deploy-build-outside-system-branch-error'Jonathan Maw2013-03-221-2/+7
|\
| * Improved error message when building or deploying outside system branchRic Holland2013-03-221-2/+7
|/
* Merge branch 'baserock/richardholland/deploy-error-no-build'Jonathan Maw2013-03-211-1/+5
|\
| * Improved error message when when system has not been built before deployRic Holland2013-03-201-1/+5
|/
* Fix condition for showing the staging-filler warningLars Wirzenius2013-03-201-1/+1
* Merge branch 'liw/detabify'Lars Wirzenius2013-03-202-3/+4
|\
| * Break long source lineLars Wirzenius2013-03-201-1/+2
| * Replace spaces with tabsLars Wirzenius2013-03-201-2/+2
|/
* Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-03-201-1/+1
|\
| * Merge branch 'liw/check-fix'Jonathan Maw2013-03-201-1/+1
| |\
| | * Use a relative symlink in test chunkLars Wirzenius2013-03-201-1/+1
| |/
* | Merge remote-tracking branch 'origin/jonathan/copy-artifacts-plugin'Lars Wirzenius2013-03-203-67/+107
|\ \ | |/ |/|
| * Remove obsolete scriptJonathan Maw2013-03-141-67/+0
| * Acknowledge the lack of test coverageJonathan Maw2013-03-142-0/+5
| * Add copy-artifacts-plugin.pyJonathan Maw2013-03-141-0/+102
* | Merge branch 'baserock/richardholland/git-config-check'Jonathan Maw2013-03-202-0/+5
|\ \
| * | check now uses git config file in morph/scriptsRic Holland2013-03-202-0/+5
|/ /
* | Merge branch 'baserock/richardholland/shorten-build-errors'Jonathan Maw2013-03-201-1/+7
|\ \
| * | Added exception to give smaller error messageRic Holland2013-03-201-1/+7
|/ /
* | Merge branch 'baserock/richardholland/stop-morph-logging-gitmodule-error'Jonathan Maw2013-03-201-1/+1
|\ \
| * | Changed the error message in log when morph fails to find gitmodulesRic Holland2013-03-201-1/+1
|/ /
* | Merge branch 'samthursfield/staging-filler-warning'Jonathan Maw2013-03-201-1/+5
|\ \