summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* stagingarea: Mount things inside dirnamebaserock/richardmaw/bugfix/stagingarea-mounts-inside-destdir-v2Richard Maw2014-12-121-1/+6
* Merge branch 'sam/fix-openstack-credentials-check'Sam Thursfield2014-12-101-4/+11
|\
| * openstack.check: Be more careful when claiming credentials are invalidSam Thursfield2014-12-091-4/+11
* | deploy: Note that some of the extensions listed live in definitions.gitSam Thursfield2014-12-094-14/+18
* | Merge remote-tracking branch 'petefoth/pf-document-extensions'Sam Thursfield2014-12-098-59/+147
|\ \ | |/ |/|
| * Add a reference to write.help filePete Fotheringham2014-12-083-18/+5
| * initramfs write extension documentationPete Fotheringham2014-12-081-0/+6
| * rawdisk write extension documentationPete Fotheringham2014-12-081-8/+34
| * ssh-rsync write extension documentationPete Fotheringham2014-12-081-0/+36
| * OpenStack write extension documentationPete Fotheringham2014-12-052-32/+39
| * Add missing types to the docstring in the DeployPlugin.deploy() functionPete Fotheringham2014-12-051-1/+27
* | Merge branch 'sam/fix-help-extensions'Sam Thursfield2014-12-082-2/+4
|\ \ | |/ |/|
| * Fix `morph help-extensions` run outside a workspaceSam Thursfield2014-12-051-1/+3
| * Fix `morph help-extensions` returning no itemsSam Thursfield2014-12-051-1/+1
|/
* Merge branch 'sam/build-branch-fixes'Sam Thursfield2014-12-043-6/+26
|\
| * Give a better error when no repos are found in a system branchSam Thursfield2014-12-041-1/+13
| * Fix finding Git directories to include in a temporary build refSam Thursfield2014-12-041-1/+1
| * Gracefully handle Git repos in system branches with missing configSam Thursfield2014-12-041-1/+5
| * Document that GitDirectory.get_config() can raise an exceptionSam Thursfield2014-12-041-3/+7
|/
* Merge branch 'baserock/pedroalvarez/fix-tests'Pedro Alvarez2014-12-025-26/+33
|\
| * tests: Update expected git outputbaserock/pedroalvarez/fix-testsPedro Alvarez2014-12-012-4/+3
| * Remove unicode charactersPedro Alvarez2014-12-011-2/+4
| * Fix line lengths to be shorter than 80 columnsPedro Alvarez2014-12-012-20/+26
|/
* Merge branch 'baserock/pedroalvarez/rawdisk-to-device8'Pedro Alvarez2014-12-014-88/+107
|\
| * writeexts.py: convert 'mount' to context managerbaserock/pedroalvarez/rawdisk-to-device8Pedro Alvarez2014-12-013-78/+58
| * Update rawdisk.check to support device deploymentsPedro Alvarez2014-12-011-8/+10
| * Modify rawdisk.write to allow the deployment to devicesPedro Alvarez2014-12-011-6/+14
| * Split create_local_system on various methodsPedro Alvarez2014-12-011-4/+19
| * Don't loop mount when mounting a devicePedro Alvarez2014-12-011-1/+4
| * Add force flag to 'mkfs.btrfs'Pedro Alvarez2014-12-011-1/+1
| * Add 'is_device' function to check if we are deploying to a devicePedro Alvarez2014-12-011-0/+11
|/
* Merge branch 'master' of https://github.com/petefoth/morphRichard Maw2014-12-012-3/+10
|\
| * Merge branch 'pf-document-extensions'Pete Fotheringham2014-12-015-38/+147
| |\
* | \ Merge branch 'master' of https://github.com/petefoth/morphRichard Maw2014-12-015-37/+139
|\ \ \ | |/ / |/| |
| * | Merge branch 'pf-document-extensions'Pete Fotheringham2014-12-015-37/+139
| |\ \ |/ / / | | _
| * Action review commentsPete Fotheringham2014-12-012-6/+28
| * More complete help documentationPete Fotheringham2014-11-281-3/+84
| * Refere to .write.help file for documentationPete Fotheringham2014-11-282-26/+11
| * Improve readability by adding blank linesPete Fotheringham2014-11-281-0/+6
| * Add more information on existing parameters.Pete Fotheringham2014-11-261-8/+16
|/
* Merge remote-tracking branch 'pf/pf-document-extensions'Richard Maw2014-11-262-28/+30
|\
| * Document the write extension in the write.help filePete Fotheringham2014-11-262-23/+26
| * Whitespace and line endings?Pete Fotheringham2014-11-251-11/+10
|/
* Merge branch 'sam/ensure-git-directory-exists'Sam Thursfield2014-11-172-12/+31
|\
| * Check that directory passed to GitDirectory is a git repoSam Thursfield2014-11-172-12/+31
* | Merge branch 'sam/fix-list-artifacts'Sam Thursfield2014-11-141-1/+1
|\ \
| * | Fix list-artifacts commandSam Thursfield2014-11-141-1/+1
* | | Merge branch 'baserock/richardmaw/fixup-ro-integrations' of git://git.baseroc...Richard Maw2014-11-146-101/+73
|\ \ \ | |/ / |/| |
| * | Unrevert "Make system-integration commands use containerised_cmdline"baserock/richardmaw/fixup-ro-integrationsRichard Maw2014-11-121-55/+5
| * | Make invert_paths work more reliably for writable-allRichard Maw2014-11-122-41/+51