summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix `morph branch-from-image` to work for deployed imagesbaserock/richardmaw/bugfix/branch-from-deployed-imageRichard Maw2014-09-111-1/+2
* Merge branch 'sam/distbuild-gpl2'Sam Thursfield2014-09-1129-40/+160
|\
| * Fix copyright years of distbuild code.Sam Thursfield2014-09-1129-29/+29
| * Fix all distbuild code to be GPLv2 licensed.Sam Thursfield2014-09-1011-21/+141
|/
* Merge branch 'baserock/pedroalvarez/openstack-exts-fixups'Pedro Alvarez2014-09-092-3/+2
|\
| * Fix up openstack.write extensionbaserock/pedroalvarez/openstack-exts-fixupsPedro Alvarez2014-09-091-1/+0
| * Fix openstack write/check exts to pass the testsPedro Alvarez2014-09-092-2/+2
|/
* Install xfer/recv-holeLars Wirzenius2014-09-081-0/+2
* Merge branch 'baserock/pedroalvarez/openstack-check-improvements'Pedro Alvarez2014-09-052-13/+49
|\
| * Check OpenStack credentials in openstack.checkbaserock/pedroalvarez/openstack-check-improvementsPedro Alvarez2014-09-052-13/+49
* | Merge branch 'baserock/liw/xfer-hole'Lars Wirzenius2014-09-055-8/+341
|\ \ | |/ |/|
| * Fix shell quoting for ssh remote command linesLars Wirzenius2014-09-052-6/+11
| * Use $((...))) instead of $(... | bc)Lars Wirzenius2014-09-051-4/+4
| * Document why VBoxManage is run in recv-hole instead of callerLars Wirzenius2014-09-051-0/+25
| * Transfer sparse files faster for kvm, vbox deploymentLars Wirzenius2014-09-055-8/+311
|/
* Merge branch 'baserock/richardmaw/less-ls-remote'Richard Maw2014-09-022-10/+23
|\
| * Use git's remotes to determine unpushed branchesbaserock/richardmaw/less-ls-remoteRichard Maw2014-09-022-10/+23
|/
* 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
| | * Make bootloader config/install more genericJames Thomas2014-08-031-17/+52
| | * Support setting a different root device using ROOT_DEVICEJames Thomas2014-08-031-2/+5
| |/