summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run yarn jobs in parallel if yarn supports itbaserock/richardmaw/run-parallel-yarnsRichard Maw2014-11-051-1/+5
* Merge remote-tracking branch 'origin/sam/transfer-status'Sam Thursfield2014-10-314-15/+45
|\
| * Echo stderr of subcommands that do network IO when --verbose is usedSam Thursfield2014-10-294-9/+42
| * Remove workaround for an old version of GitSam Thursfield2014-10-291-6/+2
| * Don't say 'Updating git repository xxx' unless we actually areSam Thursfield2014-10-291-1/+2
* | Merge branch 'baserock/richardmaw-os/unify-namespace-logic'Richard Maw2014-10-305-112/+141
|\ \ | |/ |/|
| * stagingarea: Remove vestigial pre-command mounting logicRichard Maw2014-10-301-22/+2
| * Make build commands use containerised_cmdlineRichard Maw2014-10-301-31/+14
| * Make deployment extensions use unshared_cmdlineRichard Maw2014-10-301-4/+1
| * Make system-integration commands use containerised_cmdlineRichard Maw2014-10-301-55/+5
| * Move unsharing and containerising logic to utilRichard Maw2014-10-301-0/+114
| * Allow invert_paths to skip the top level directoryRichard Maw2014-10-291-0/+5
|/
* Fix lines longer than 79 charactersSam Thursfield2014-10-292-3/+4
* Merge remote-tracking branch 'origin/sam/build-fix-3'Sam Thursfield2014-10-295-17/+38
|\
| * Fix distbuild to allow passing a commit instead of a named ref to be builtSam Thursfield2014-10-275-17/+38
* | Make pushed_build_branch always return (url, commit, ref)Richard Ipsum2014-10-281-2/+7
|/
* Merge branch 'baserock/ps/message-fix'Sam Thursfield2014-10-271-1/+1
|\
| * 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