summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* docker.write: Fill in port number if not suppliedsam/docker.writeSam Thursfield2014-09-171-6/+13
* Revert "TEMP: debug"Sam Thursfield2014-09-171-5/+1
* docker.write: Timeout after 10 seconds (default in docker-py is 60)Sam Thursfield2014-09-171-4/+10
* docker.write: Fix example SSH tunnel command in .helpSam Thursfield2014-09-171-1/+1
* docker.write: Rework connection codeSam Thursfield2014-09-171-29/+33
* TEMP: debugSam Thursfield2014-09-171-1/+5
* docker.write: Misc fixesSam Thursfield2014-09-171-4/+6
* docker.write: Require my patch to docker-pySam Thursfield2014-09-171-24/+4
* docker.write: Much improvementSam Thursfield2014-09-052-84/+110
* docker.write: Fix wrong symlink paths in the system tarballSam Thursfield2014-09-051-1/+2
* Fix more stuff!Sam Thursfield2014-09-051-6/+21
* It still worksSam Thursfield2014-09-051-88/+82
* start to unwind vim undo history to see where it brokeSam Thursfield2014-09-051-35/+44
* It worksSam Thursfield2014-09-051-58/+144
* WHATSam Thursfield2014-09-052-3/+13
* Add list-system-contents commandSam Thursfield2014-09-052-0/+120
* more docker.writeSam Thursfield2014-09-052-133/+161
* Add bgtunnel from upstreamSam Thursfield2014-09-051-0/+437
* docker.write: First attemptSam Thursfield2014-09-051-0/+196
* Merge branch 'sam/less-cache-key-logging'Sam Thursfield2014-09-021-15/+5
|\
| * Remove some cache key related log messagesSam Thursfield2014-08-291-15/+5
* | Merge branch 'deploy-improvements'Sam Thursfield2014-09-016-36/+198
|\ \
| * | deploy: Make Python extensions log debug messages to MORPH_LOG_FD by defaultSam Thursfield2014-09-011-1/+24
| * | deploy: Allow extensions to write to Morph log fileRichard Maw2014-09-012-26/+143
| * | Add `morph upgrade` command, deprecate `morph deploy --upgrade`Sam Thursfield2014-09-014-8/+30
| * | Clarify that multiple images can be deployed at once by `morph deploy`Sam Thursfield2014-09-011-1/+1
|/ /
* | Merge branch 'baserock/richardmaw/yarn-git-daemon'Richard Maw2014-08-2811-150/+143
|\ \ | |/ |/|
| * yarns: Use a more realistic simulation of a git serverbaserock/richardmaw/yarn-git-daemonRichard Maw2014-08-287-11/+62
| * Add script for launching git daemon on random portRichard Maw2014-08-281-0/+46
| * Add yarn for building uncommitted changesRichard Maw2014-08-282-56/+33
| * yarns: Use run_morph for pushing branchesRichard Maw2014-08-281-1/+2
| * Remove cmdtests deprecated by yarnsRichard Maw2014-08-282-82/+0
|/
* Merge remote-tracking branch 'origin/baserock/richardmaw/bugfix/http-fail'Richard Maw2014-08-262-5/+12
|\
| * Only autodetect morphology when result is 404baserock/richardmaw/bugfix/http-failRichard Maw2014-08-192-5/+12
* | Fix `morph edit` for non-file URIsRichard Maw2014-08-261-1/+1
* | Prevent git-replace refs affecting git operationsRichard Maw2014-08-2111-139/+171
* | deploy: Check correct usage of --upgrade for rawdisk deploymentsSam Thursfield2014-08-191-0/+21
* | Cache configuration values in GitDirectory.Daniel Silverstone2014-08-191-2/+6
|/
* Merge branch 'baserock/straycat/distbuild-trivia'Sam Thursfield2014-08-181-30/+9
|\
| * Rename for consistencyRichard Ipsum2014-08-141-10/+9
| * Remove dead functionsRichard Ipsum2014-08-141-20/+0
* | Merge branch 'baserock/franred/fixes-needed-for-organize-definitions'Francisco Redondo Marchena2014-08-152-26/+40
|\ \ | |/ |/|
| * Fix morphloader to unset_defaults for chunksFrancisco Redondo Marchena2014-08-151-2/+13
| * Update morphloader_test.pyFrancisco Redondo Marchena2014-08-151-12/+13
| * Set chunk static default to Nonebaserock/franred/fixes-needed-for-organize-definitionsFrancisco Redondo Marchena2014-08-151-12/+12
| * Add system-integration to chunk _static_defaultsFrancisco Redondo Marchena2014-08-151-0/+1
| * Add deploy-defaults before deploy in the MorphologyDumper keyorderFrancisco Redondo Marchena2014-08-151-0/+1
|/
* Merge branch 'baserock/richardmaw/james/writeexts_support_jetson'James Thomas2014-08-142-22/+83
|\
| * Merge remote-tracking branch 'origin/baserock/james/writeexts_support_jetson'baserock/richardmaw/james/writeexts_support_jetsonRichard Maw2014-08-122-22/+83
| |\
| | * Add support for a device tree to be set using DTB_PATHbaserock/james/writeexts_support_jetsonJames Thomas2014-08-031-0/+21