summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'liw/restore-old-cmds'"Richard Maw2013-08-2916-181/+21
* Merge branch 'baserock/richardmaw/S8646/edit-odd-submodules' of git://git.bas...Richard Maw2013-08-2711-84/+145
|\
| * Use Submodules class to read submodule configRichard Maw2013-08-231-6/+6
| * tests: Make dummy strata pass validationRichard Maw2013-08-2310-78/+139
* | Remove redundant dict.getRichard Maw2013-08-231-1/+0
* | Merge branch 'baserock/richardmaw/S8563/bootstrap-rootfs-protection'Richard Maw2013-08-234-40/+184
|\ \ | |/ |/|
| * Make the tempdir writable in bootstrap mode.Richard Maw2013-08-161-3/+7
| * stagingarea: use linux-user-chroot in bootstrapsRichard Maw2013-08-151-28/+30
| * stagingarea: use invert_paths to bind-mount roRichard Maw2013-08-151-10/+10
| * fsutils: add invert_paths functionRichard Maw2013-08-153-9/+148
* | Note deployments have changed in READMEbaserock-10Lars Wirzenius2013-08-191-0/+1
* | Merge branch 'liw/restore-old-cmds'Lars Wirzenius2013-08-1916-24/+184
|\ \
| * | Use new edit instead of old one in testsLars Wirzenius2013-08-1913-19/+19
| * | Restore old branch and merge subcommandsLars Wirzenius2013-08-192-4/+164
| * | Fix name of yarn scenarioLars Wirzenius2013-08-191-1/+1
|/ /
* | Fix naming of SATA Controller in VirtualBox deploymentsLars Wirzenius2013-08-191-3/+3
* | Merge remote-tracking branch 'origin/baserock/tiagogomes/new_deployment_v4'Lars Wirzenius2013-08-1612-90/+401
|\ \
| * | Add initial code to support clusters in morphloaderTiago Gomes2013-08-162-6/+27
| * | Rework `morph deploy` to work with cluster morphologies.Tiago Gomes2013-08-165-81/+261
| * | Add support for a `cluster` type of morphology.Tiago Gomes2013-08-163-2/+103
| * | Utility function to convert all values in a dictionary to stringsTiago Gomes2013-08-162-1/+10
|/ /
* | Merge branch 'liw/refactor-edit-v2'Lars Wirzenius2013-08-1644-463/+2086
|\ \
| * | Fix variable nameLars Wirzenius2013-08-161-1/+1
| * | Use print-architecture instead of arch -m in testsLars Wirzenius2013-08-151-1/+2
| * | Add "morph print-architecture" subcommandLars Wirzenius2013-08-154-0/+100
| * | Clarify _get_stratum_triplets codeLars Wirzenius2013-08-151-1/+15
| * | Fix "morph edit" to load morphologies from git when neededLars Wirzenius2013-08-151-1/+32
| * | Add GitDir.is_currently_checked_outLars Wirzenius2013-08-151-0/+17
| * | Use isinstance instead of type when checking morphology object typeLars Wirzenius2013-08-151-1/+1
| * | Check for empty strata earlierLars Wirzenius2013-08-151-4/+4
| * | Fix how stratum empty build deps check is doneLars Wirzenius2013-08-151-1/+1
| * | Systematically use spec instead of infoLars Wirzenius2013-08-151-4/+4
| * | Rename method to MorphologyLoader.parse_morphology_textLars Wirzenius2013-08-152-6/+8
| * | Drop use of explicit StringIO with the yaml moduleLars Wirzenius2013-08-151-5/+2
| * | Disable tests broken by "morph edit"Lars Wirzenius2013-08-1410-2/+55
| * | Disable merge testsLars Wirzenius2013-08-141-1/+1
| * | Disable test cases (lack of time, may not need feature)Lars Wirzenius2013-08-143-2/+19
| * | Fix test suite to patch YAML instead of JSONLars Wirzenius2013-08-1415-444/+361
| * | Fix test morphology to be a valid oneLars Wirzenius2013-08-141-0/+3
| * | Re-implement "morph edit" using new infrastructureLars Wirzenius2013-08-142-2/+206
| * | Add a MorphologySet class, for changing many morphologiesLars Wirzenius2013-08-143-0/+339
| * | Load morphologies using the new mechanisms, not the oldLars Wirzenius2013-08-141-4/+4
| * | Add new morphology abstraction and morphology loading/savingLars Wirzenius2013-08-145-0/+912
| * | Make SystemBranchDirectory remember an absolute pathLars Wirzenius2013-08-141-1/+1
| * | Add SystemBranchDirectory.get_filename methodLars Wirzenius2013-08-142-0/+18
| * | Remove unused argument from SystemBranchDirectory.clone_cached_repoLars Wirzenius2013-08-143-7/+5
| |/
* | Merge branch 'jonathan/disable-network'Jonathan Maw2013-08-151-0/+1
|\ \ | |/ |/|
| * Disable network during buildsJonathan Maw2013-08-131-0/+1
|/
* Merge remote-tracking branch 'origin/baserock/richardmaw/S8544/deploy-cleanup...Lars Wirzenius2013-08-133-55/+106
|\
| * deploy: Always cleanup deploy tempdir on failureRichard Maw2013-08-131-45/+52