summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| |\ \
| | * \ Merge branch 'baserock/richardipsum/post_artifacts5'Richard Ipsum2014-04-151-3/+31
| | |\ \
| | | * | Add post request for /artifactsRichard Ipsum2014-04-151-3/+31
| | |/ /
| | * | Update copyright noticeRichard Ipsum2013-12-164-24/+3
| | * | Merge branch 'baserock/tiagogomes/lighttpd'Tiago Gomes2013-09-121-3/+11
| | |\ \
| | | * | Allow to use flup as the backend server for bottle.Tiago Gomes2013-09-121-3/+11
| | |/ /
| | * | Merge branch 'jonathan/fix-resolve-sha1-rebase'Jonathan Maw2013-06-041-3/+8
| | |\ \
| | | * | Handle requesting a sha1 of a sha1Jonathan Maw2013-06-041-3/+8
| | |/ /
| | * | Merge remote-tracking branch 'origin/jannispohlmann/add-batch-sha1-and-file-q...Lars Wirzenius2013-01-141-0/+53
| | |\ \
| | | * | Handle batch sha1/file queries using POST requestsJannis Pohlmann2013-01-021-0/+53
| | |/ /
| | * | Fix misspelled variable nameSam Thursfield2012-12-131-1/+1
| | * | Log exceptions instead of ignoring themSam Thursfield2012-12-131-1/+1
| | * | Use 'git rev-parse --verify' to resolve refsSam Thursfield2012-12-131-22/+9
| | * | Fix missing argument to rev_list(), breaking resolve_ref for SHA1sJannis Pohlmann2012-12-031-1/+1