summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'sam/nfs-deploy-fixes'Richard Ipsum2014-03-203-60/+74
|\ \ \
| * | | Make sanity checks for nfsboot deployments run earlierSam Thursfield2014-03-182-55/+70
| * | | Improve comment in nfsboot.configureSam Thursfield2014-03-181-1/+3
| * | | Remove fstab hack from nfsboot.configureSam Thursfield2014-03-181-4/+1
| | |/ | |/|
* | | Merge branch 'baserock/pedroalvarez/system-integration5'Pedro Alvarez2014-03-203-7/+96
|\ \ \
| * | | Run the system integration commands when buildingPedro Alvarez2014-03-201-0/+46
| * | | Generate scripts with the system-integration-commands of chunk morphologies.Pedro Alvarez2014-03-201-3/+42
| * | | Use morphlib.fsutils.mount when possiblePedro Alvarez2014-03-181-1/+1
| * | | Extend morphlib.fsutils.mount to take a fstypePedro Alvarez2014-03-181-3/+7
| |/ /
* | | Merge branch 'adamcoldrick/ingest-binaries-v5-rebase'Adam Coldrick2014-03-206-3/+259
|\ \ \ | |/ / |/| |
| * | Implement morph push and morph pulladamcoldrick/ingest-binaries-v5-rebaseAdam Coldrick2014-03-202-0/+95
| * | Implement morph add-binary using git-fat to store large filesAdam Coldrick2014-03-201-0/+110
| * | Make existing morph commands use git-fatAdam Coldrick2014-03-203-1/+22
| * | Add functionality for doing git commands in a directoryAdam Coldrick2014-03-201-2/+32
|/ /
* | Merge remote-tracking branch 'origin/baserock/richardmaw/S10630-32-bit-tests'Lars Wirzenius2014-03-1721-266/+97
|\ \
| * | Allow run-in-artifact cmdtest to pass on x86_32Richard Maw2014-03-142-2/+1
| * | Remove bootstrap-mode cmdtestRichard Maw2014-03-142-56/+0
| * | Remove morph tag cmdtestsRichard Maw2014-03-144-177/+0
| * | Raise the disk image size for deployment testRichard Maw2014-03-141-1/+1
| * | Use morph print-architecture to generate morphologiesRichard Maw2014-03-1411-13/+13
| * | check script: allow fine-grained control of which tests are runRichard Maw2014-03-141-17/+82
|/ /
* | Merge branch 'baserock/richardmaw/S10630-multi-deploy-v2'Richard Maw2014-03-1410-116/+368
|\ \
| * | Revert "tests: Allow running ./check on 32-bit x86"Richard Maw2014-03-1416-24/+24
| * | tests: Allow running ./check on 32-bit x86Richard Maw2014-03-1416-26/+26
| * | deploy: Set status prefix to show which deployment the status is forRichard Maw2014-03-141-53/+69
| * | deploy: Make extension output display which it isRichard Maw2014-03-141-1/+2
| * | Test nested deploymentsRichard Maw2014-03-144-30/+125
| * | Add sysroot write extensionRichard Maw2014-03-141-0/+29
| * | scripts: Add helper commands for altering cluster morphologiesRichard Maw2014-03-141-11/+97
| * | Add the ability to do nested deploymentsRichard Maw2014-03-141-6/+18
| * | Move deploy logic into multiple methodsRichard Maw2014-03-141-14/+28
| * | Move tempdir creation out of the loopRichard Maw2014-03-141-21/+27
| * | Patch buildcommand once, rather that once per systemRichard Maw2014-03-141-3/+5
| * | Remove ugly loading of old b&m pluginRichard Maw2014-03-141-10/+0
| * | yarns: set deployment name based on system nameRichard Maw2014-03-144-7/+8
| * | Fix copyright date in stagingarea_testsRichard Maw2014-03-141-1/+1
|/ /
* | Merge branch 'liw/quieten-staging-area'Lars Wirzenius2014-03-133-6/+10
|\ \
| * | Reduce spam from setting up staging areaLars Wirzenius2014-03-103-6/+10
* | | Merge branch 'sam/build-cluster-error'Sam Thursfield2014-03-122-2/+5
|\ \ \
| * | | Give a useful error when attempting to build a cluster morphSam Thursfield2014-03-121-1/+4
| * | | Fix creating a Source() from a cluster morphologySam Thursfield2014-03-121-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/sam/deploy-test-fix'Lars Wirzenius2014-03-102-8/+4
|\ \ \
| * | | tests: Fix tests.deploy/deploy-clusterSam Thursfield2014-03-112-8/+4
|/ / /
* | | Merge branch 'sam/branching-fixes'Sam Thursfield2014-03-113-5/+10
|\ \ \ | |/ / |/| |
| * | Fix `morph petrify` in cases where root repo URL has a trailing /Sam Thursfield2014-03-072-3/+8
| * | Raise correct error on `morph checkout|branch` of repo with no morphsSam Thursfield2014-03-071-2/+2
* | | Merge branch 'liw/fix-check-2-rebase'Lars Wirzenius2014-03-1041-195/+246
|\ \ \ | |/ / |/| |
| * | Fix paths for chunk directories in cmdtestsLars Wirzenius2014-03-0633-148/+164
| * | Convert colons to slashes for chunk nameLars Wirzenius2014-03-062-3/+14
| * | Fix directory names for chunks to use slashes, not colonsLars Wirzenius2014-03-061-5/+5