summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphbaserock-8Daniel Silverstone2013-05-301-1/+1
|\
| * Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphLars Wirzenius2013-05-301-3/+8
| |\
| * | Update copyright yearLars Wirzenius2013-05-301-1/+1
* | | Update author details in setup.pyDaniel Silverstone2013-05-301-2/+2
| |/ |/|
* | Merge branch 'baserock/richardmaw/conficting-strata'Richard Maw2013-05-301-3/+8
|\ \ | |/ |/|
| * build graph: Improve the comment for stratum duplicate checkRichard Maw2013-05-291-3/+8
* | Merge remote-tracking branch 'origin/jonathan/tar-write-ext'Lars Wirzenius2013-05-301-0/+21
|\ \
| * | Tar write extension fails if arguments not setJonathan Maw2013-05-301-0/+2
| * | Add tar write extensionJonathan Maw2013-05-301-0/+19
|/ /
* | Merge remote-tracking branch 'origin/richarddale/qmake_build_system'Lars Wirzenius2013-05-306-0/+250
|\ \
| * | qmake build system test still succeeds when qmake isn't foundRichard Dale2013-05-301-0/+6
| * | Add detection for cmake and qmake build systemsRichard Dale2013-05-296-0/+244
|/ /
* | Merge remote-tracking branch 'origin/jonathan/deploy-needs-DISK_SIZE-rebase'Lars Wirzenius2013-05-293-10/+37
|\ \ | |/ |/|
| * Apply Richard Maw's suggestionsJonathan Maw2013-05-292-16/+2
| * Make deploy-rawdisk test pass and add a test for undefined DISK_SIZEJonathan Maw2013-05-292-1/+38
| * Make create_local_system fail if DISK_SIZE isn't definedJonathan Maw2013-05-291-1/+5
|/
* Merge remote-tracking branch 'origin/baserock/danielsilverstone/repo-alias-up...Lars Wirzenius2013-05-282-18/+20
|\
| * REPOALIAS: Restructure debuggingDaniel Silverstone (br7vm)2013-05-281-16/+9
| * REPOALIAS: Update repo alias to support dashes and to be more strict.Daniel Silverstone (br7vm)2013-05-282-2/+11
* | Merge remote-tracking branch 'origin/jonathan/ssh-rsync-write-rebase'Lars Wirzenius2013-05-281-0/+181
|\ \
| * | Add ssh-rsync write extensionJonathan Maw2013-05-281-0/+181
| |/
* | Merge branch 'liw/deploy-not-exec-message'Lars Wirzenius2013-05-283-2/+11
|\ \
| * | Give better error message if extension is not executableLars Wirzenius2013-04-161-0/+9
* | | Merge branch 'liw/kill-bare-except'Lars Wirzenius2013-05-288-29/+56
|\ \ \
| * | | Stop using bare except: statementsLars Wirzenius2013-04-168-29/+56
| |/ /
* | | Merge branch 'liw/check-x'Lars Wirzenius2013-05-283-0/+8
|\ \ \ | |_|/ |/| |
| * | Remove executable permissions from *.py files that have themLars Wirzenius2013-05-282-0/+0
| * | Add check for executable *.py filesLars Wirzenius2013-05-281-0/+8
|/ /
* | Merge remote-tracking branch 'origin/baserock/richarddale/metadata_contents'Lars Wirzenius2013-05-287-25/+65
|\ \
| * | Fix the expected hash key value in the run-in-artifact-with-different-artifac...Richard Dale2013-05-281-1/+1
| * | Fix kvm working without autostartJonathan Maw2013-05-281-1/+1
| * | rename trove-prefix and trove_prefix to trove_idPaul Sherwood2013-05-283-17/+17
| * | Add tests for listing a chunk's contentsRichard Dale2013-05-241-0/+9
| * | Make morphlib.bins.chunk_filenames() a private methodRichard Dale2013-05-241-3/+3
| * | Remove excessive debugging messagesRichard Dale2013-05-242-7/+2
| * | Include the artifact metadata-version in the cache id keyRichard Dale2013-05-243-4/+6
| * | Add contents list to chunk and stratum metadataRichard Dale2013-05-243-21/+55
* | | Merge branch 'ps/to-trove-id'Lars Wirzenius2013-05-273-17/+17
|\ \ \
| * | | rename trove-prefix and trove_prefix to trove_idPaul Sherwood2013-04-133-17/+17
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/jonathan/kvm-working-noreboot'Lars Wirzenius2013-05-271-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix kvm working without autostartJonathan Maw2013-05-241-1/+1
|/ /
* | Merge branch 'add-trovectl' of git://git.baserock.org/baserock/baserock/morphTiago Gomes2013-05-242-0/+33
|\ \
| * | Add the trovectl plugin to the morph plugins directory.Tiago Gomes2013-05-232-0/+33
|/ /
* | Merge remote-tracking branch 'origin/tiagogomes/upgrades2'Lars Wirzenius2013-05-232-9/+55
|\ \
| * | Use the name factory for the first system version.Tiago Gomes2013-05-233-3/+3
| * | Implement raw disk upgrades.Tiago Gomes2013-05-231-4/+50
| * | Allow installing extlinux to other system versions.Tiago Gomes2013-05-201-4/+4
* | | Merge remote-tracking branch 'origin/jonathan/nfsboot-upgrade'Lars Wirzenius2013-05-211-1/+22
|\ \ \ | |/ / |/| |
| * | nfsboot deployment creates local state dirsJonathan Maw2013-05-201-0/+8
| * | Can define version by the environment variable 'VERSION'Jonathan Maw2013-05-201-1/+14
|/ /