summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19typoJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19stop removing privdata, it's no longer in masterJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19remove privdata from master, to avoid conflicts with other users' privdataJoey Hess
This will result in some easily resolved merge conflicts when I merge joeyconfig into master. I never merge master into joeyconfig so that's ok.
2014-08-19local repo fully working nowJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19The Debian package now includes a single-revision git repository in ↵Joey Hess
/usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.
2014-08-19Merge remote-tracking branch 'origin/master'Joey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19The Debian package now includes a single-revision git repository in ↵Joey Hess
/usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.
2014-08-19upgrade noteJoey Hess
2014-08-19Included the config.hs symlink to config-simple.hs in the cabal and Debian ↵Joey Hess
packages.
2014-08-19updateJoey Hess
2014-08-17Added a commenthttp://joeyh.name/
2014-08-13propellor spinJoey Hess
2014-08-13propellor spinJoey Hess
2014-08-04add news item for propellor 0.8.2Joey Hess
2014-08-04Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'Joey Hess
2014-08-04Merge branch 'master' of ssh://propellor.branchable.comJoey Hess
2014-08-04Merge branch 'joeyconfig'Joey Hess
2014-08-04prep releaseJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23changelogJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23updateJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-22propellor spinJoey Hess
2014-07-22propellor spinJoey Hess
2014-07-22propellor spinJoey Hess
2014-07-22propellor spinJoey Hess
2014-07-22propellor spinJoey Hess
2014-07-22propellor spinJoey Hess
2014-07-22updateJoey Hess