summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFiles
* clean up after mergeHEADmasterJoey Hess2018-05-032
* Merge branch 'joeyconfig'Joey Hess2018-05-037
|\
| * propellor spinJoey Hess2018-05-030
| * propellor spinJoey Hess2018-05-031
| * remove badly placed and redundant commentJoey Hess2018-05-031
| * propellor spinJoey Hess2018-05-030
| * setting up joeyconfig after mergeJoey Hess2018-05-032
| * Merge branch 'master' into joeyconfigJoey Hess2018-05-0312
| |\
| * | propellor spinJoey Hess2018-05-030
| * | propellor spinJoey Hess2018-05-031
| * | propellor spinJoey Hess2018-05-011
| * | propellor spinJoey Hess2018-05-011
| * | propellor spinJoey Hess2018-05-010
| * | propellor spinJoey Hess2018-05-010
| * | propellor spinJoey Hess2018-05-010
| * | propellor spinJoey Hess2018-05-011
* | | commentJoey Hess2018-05-031
| |/ |/|
* | Update shim each time propellor is run in a container, to deal with library v...Joey Hess2018-05-033
* | Merge branch 'master' of ssh://propellor.branchable.comJoey Hess2018-05-021
|\ \
| * | Added a commentpicca2018-05-011
* | | changelogJoey Hess2018-05-021
* | | make Schroot.overlaysInTmpfs revertableSean Whitton2018-05-021
* | | updateJoey Hess2018-05-021
|/ /
* | Merge branch 'master' of ssh://propellor.branchable.comJoey Hess2018-04-301
|\ \
| * | Added a commentjsza2018-04-301
* | | Merge branch 'joeyconfig'Joey Hess2018-04-301
|\ \ \ | | |/ | |/|
| * | propellor spinJoey Hess2018-04-301
* | | notes on failed attempt to migrateJoey Hess2018-04-301
| |/ |/|
* | responsesJoey Hess2018-04-302
* | clean up after mergeJoey Hess2018-04-302
|/
* propellor spinJoey Hess2018-04-300
* Revert "Added dependency on concurrent-output; removed embedded copy."Joey Hess2018-04-308
* propellor spinJoey Hess2018-04-300
* propellor spinJoey Hess2018-04-300
* propellor spinJoey Hess2018-04-300
* Merge branch 'master' into joeyconfigJoey Hess2018-04-3015
|\
| * fix broken SemigroupMonoid transition <<loop>>Joey Hess2018-04-3015
* | Merge branch 'master' into joeyconfigJoey Hess2018-04-306
|\ \ | |/
| * fix build with ghc 8.2Joey Hess2018-04-301
| * signaturespwhitton2018-04-291
| * we should factor out code in Grub.configuredspwhitton2018-04-291
| * Added a commentpicca2018-04-291
| * Added a commentpicca2018-04-291
| * (no commit message)picca2018-04-291
| * (no commit message)jsza2018-04-281
| * (no commit message)jsza2018-04-281
* | setting up joeyconfig after mergeJoey Hess2018-04-292
* | Merge branch 'master' into joeyconfigJoey Hess2018-04-2910
|\ \ | |/
| * clean up after mergeJoey Hess2018-04-232
| * Merge branch 'joeyconfig'Joey Hess2018-04-232
| |\