summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix confusing messagebaserock/ps/message-fixPaul Sherwood2014-10-271-1/+1
* Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph into ...Paul Sherwood2014-10-2713-100/+229
|\
| * Merge branch 'sam/build-fix-2'Sam Thursfield2014-10-275-26/+49
| |\
| | * build: Resolve the ref being built in the user's local definitions.gitSam Thursfield2014-10-243-7/+18
| | * build: Allow passing in the name of the original ref to create_source_pool()Sam Thursfield2014-10-242-7/+15
| | * build: Restructure how BuildCommand.build() is calledSam Thursfield2014-10-242-15/+19
| |/
| * Merge branch 'baserock/richardmaw/parallelism-improvements'Richard Maw2014-10-243-11/+23
| |\
| | * stagingarea: Mount proc and ccache inside the namespaceRichard Maw2014-10-242-10/+18
| | * deploy extensions: Don't crash if someone builds at the same timeRichard Maw2014-10-241-1/+3
| |/
| * Merge branch 'baserock/richardmaw/test-system-integrations'Richard Maw2014-10-245-54/+152
| |\
| | * yarns: Add yarns for system-integrationsRichard Maw2014-10-242-0/+38
| | * Run system-integrations in a namespaceRichard Maw2014-10-241-23/+53
| | * yarns: Fix missing FINALLYRichard Maw2014-10-241-0/+1
| | * test-shell: Allow to be used in system-integrationsRichard Maw2014-10-241-39/+49
| | * test-shell: add create file commandRichard Maw2014-10-241-0/+20
| |/
| * Merge branch 'sam/fix-edit-synopsis'Sam Thursfield2014-10-221-1/+1
| |\
| | * Fix synopsis of `morph edit` commandSam Thursfield2014-10-221-1/+1
| |/
| * Merge remote-tracking branch 'origin/sam/validation-fixes'Sam Thursfield2014-10-171-8/+4
| |\
| | * Give clearer error when the same 'name' is used by two strataSam Thursfield2014-10-161-5/+4
| | * Don't print the ref of each stratum in the buildSam Thursfield2014-10-161-3/+0
| |/
* | Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph into ...Paul Sherwood2014-10-140-0/+0
|\ \ | |/
| * Merge branch 'baserock/richardipsum/arfix'Richard Maw2014-10-131-74/+51
| |\
* | \ Merge remote-tracking branch 'origin/baserock/richardipsum/arfix' into HEADPaul Sherwood2014-10-111-74/+51
|\ \ \ | |/ / |/| / | |/
| * Simplify _resolve_system_artifactsRichard Ipsum2014-10-101-12/+4
| * Replace resolver queue with loopRichard Ipsum2014-10-101-62/+57
| * Remove queueingRichard Maw2014-10-101-16/+6
* | Remove out of date commentRichard Ipsum2014-10-101-3/+0
* | Merge branch 'sam/fix-list-artifacts'Sam Thursfield2014-10-101-6/+7
|\ \
| * | Fix the `morph list-artifacts` commandSam Thursfield2014-10-101-6/+7
| |/
* | Merge branch 'baserock/richardmaw/fix-ssh-rsync-destroying-versions'Richard Maw2014-10-101-77/+105
|\ \ | |/ |/|
| * ssh-rsync: Don't delete version if it existsRichard Maw2014-10-101-77/+105
|/
* Merge remote-tracking branch 'origin/baserock/ps/log-chunk-build-times'Richard Maw2014-10-091-0/+8
|\
| * Log elapsed time for each chunk buildbaserock/ps/log-chunk-build-timesPaul Sherwood2014-09-271-0/+7
* | Update artifact resolver and ckc testsRichard Ipsum2014-10-092-9/+9
* | Tidy up artifact resolvingRichard Ipsum2014-10-092-34/+24
* | Merge branch 'sam/handle-missing-version-label'Sam Thursfield2014-10-082-2/+7
|\ \
| * | deploy: Make ssh-rsync upgrade extension handle unset VERSION_LABELSam Thursfield2014-10-082-2/+7
* | | Merge branch 'baserock/richardmaw/fix-distbuild-v3'Richard Maw2014-10-0874-2431/+1436
|\ \ \ | |/ / |/| |
| * | distbuild: serialize dependent sources of graphRichard Maw2014-10-082-24/+46
| * | Allow distbuilds to choose where to put logsRichard Maw2014-10-083-1/+14
| * | Only attempt to run distbuild yarns if possibleRichard Maw2014-10-082-0/+4
| * | distbuild: yaml-encode messages before json encodingRichard Maw2014-10-081-2/+8
| * | Allow distbuilding morphologies with binary data embeddedRichard Maw2014-10-081-9/+10
| * | Test that morph can handle binary garbage output in buildsRichard Maw2014-10-081-1/+11
| * | Add echo to the test shellRichard Maw2014-10-081-0/+6
| * | Fix issues with distbuild caused by moving to building per-sourceRichard Maw2014-10-086-25/+31
| * | Add distbuilding yarnRichard Maw2014-10-023-7/+192
| * | Allow morph-cache-server to be bound to an ephemeral portRichard Maw2014-10-022-5/+31
| * | Allow ephemeral ports for distbuild servicesRichard Maw2014-10-022-2/+2
| * | Merge in morph cache serverRichard Maw2014-10-014-6/+527
| |\ \