summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'debian/0.3.1Joey Hess2014-04-17
|\
| * propellor (0.3.0) unstable; urgency=mediumJoey Hess2014-04-11
* Merge branch 'joeyconfig'Joey Hess2014-04-17
|\
| * prep releaseJoey Hess2014-04-17
* | use config.simple and allow building debian packagesJoey Hess2014-04-17
* | Merge branch 'joeyconfig'Joey Hess2014-04-17
|\|
| * add back prevention from building debian package from joeyconfig branchJoey Hess2014-04-17
| * propellor spinJoey Hess2014-04-17
| * propellor spinJoey Hess2014-04-17
| * point back to config-joeyJoey Hess2014-04-17
| * cron lockingJoey Hess2014-04-17
| * Revert "flock local directory to prevent multiple obnams stacking up"Joey Hess2014-04-17
* | Merge branch 'joeyconfig'Joey Hess2014-04-17
|\|
| * flock local directory to prevent multiple obnams stacking upJoey Hess2014-04-17
| * Add support for SSH ed25519 keysFranz Pletz2014-04-16
* | Add support for SSH ed25519 keysFranz Pletz2014-04-16
|/
* Merge branch 'joeyconfig'Joey Hess2014-04-15
|\
| * since http conduit is broken on stable, go ghetto and use curlJoey Hess2014-04-15
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * updateJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-14
* | Merge branch 'joeyconfig'Joey Hess2014-04-14
|\|
| * fixJoey Hess2014-04-14
* | Merge branch 'joeyconfig'Joey Hess2014-04-14
|\|
| * monstersJoey Hess2014-04-14
* | Merge branch 'joeyconfig'Joey Hess2014-04-14
|\|
| * flowJoey Hess2014-04-14
* | Merge branch 'joeyconfig'Joey Hess2014-04-14
|\|
| * asciiJoey Hess2014-04-14
| * propellor spinJoey Hess2014-04-13