summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Check OpenStack credentials in openstack.checkbaserock/pedroalvarez/openstack-check-improvementsPedro Alvarez2014-09-052-13/+49
* 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
| |/
* | Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'Adam Coldrick2014-08-1450-2212/+1016
|\ \
| * | Rename morph3 to morphologyAdam Coldrick2014-08-146-57/+57
| * | Revert "Ensure that none of the _orig_* fields are in the cache key"Adam Coldrick2014-08-141-4/+1
| * | Remove morph2 and its testsAdam Coldrick2014-08-143-705/+0
| * | edit-morph: Use morphloader rather than morph2Adam Coldrick2014-08-141-52/+8
| * | cmdtests: Use YAML not JSON to represent morphologiesAdam Coldrick2014-08-1421-867/+549
| * | cmdtests: Change the error messages to be detectedAdam Coldrick2014-08-144-4/+4
| * | unittests: Make the unittests use morphloaderAdam Coldrick2014-08-146-297/+254
| * | buildsystem: Generate a Morphology not textAdam Coldrick2014-08-144-30/+29
| * | morphologyfactory: Use morphloader not morph2Adam Coldrick2014-08-142-166/+75
| * | morphloader: Get commands when loading morphologyAdam Coldrick2014-08-144-3/+14
| * | morphloader: Add and remove some default valuesAdam Coldrick2014-08-142-12/+21
| * | morphset: Don't expect to be able to find `morph` or `name`Adam Coldrick2014-08-141-3/+5
| * | show-dependencies: Use sanitise_morphology_path instead of stripping `.morph`Adam Coldrick2014-08-142-3/+3