Commit Graph

1282 Commits

Author SHA1 Message Date
Joey Hess 9fcf77c066
propellor spin 2014-04-04 14:37:59 -04:00
Joey Hess 9517bb13e0
propellor spin 2014-04-04 09:30:14 -04:00
Joey Hess cec76dda3b
propellor spin 2014-04-04 02:07:18 -04:00
Joey Hess a3206d45d6 redo a change I lost somewhere
fixes ghc spain in i386 container on amd64 host
2014-04-04 02:06:19 -04:00
Joey Hess 49383915e7
propellor spin 2014-04-04 01:41:23 -04:00
Joey Hess 5c730c6f38 Merge branch 'joeyconfig' 2014-04-04 01:39:55 -04:00
Joey Hess fb04055dde foo 2014-04-04 01:39:50 -04:00
Joey Hess 336e3ccf84 Merge branch 'joeyconfig'
Conflicts:
	config.hs
2014-04-04 01:38:01 -04:00
Joey Hess 25a0026050 nope 2014-04-04 01:37:31 -04:00
Joey Hess effa897faa
propellor spin 2014-04-04 01:25:16 -04:00
Joey Hess 2e2f4ac913 Merge branch 'joeyconfig' 2014-04-04 01:16:18 -04:00
Joey Hess f75db89007 improve 2014-04-04 01:16:16 -04:00
Joey Hess 8bb175d107 Merge branch 'joeyconfig'
Conflicts:
	config.hs
2014-04-04 01:12:44 -04:00
Joey Hess ccc8290712 update 2014-04-04 01:12:09 -04:00
Joey Hess eb8dcfd995
propellor spin 2014-04-04 00:44:29 -04:00
Joey Hess ba8a259f24
propellor spin 2014-04-04 00:29:19 -04:00
Joey Hess dd08ae61db
propellor spin 2014-04-04 00:18:51 -04:00
Joey Hess 3aff991553
propellor spin 2014-04-04 00:11:24 -04:00
Joey Hess 2231fce6bf
propellor spin 2014-04-04 00:09:01 -04:00
Joey Hess cf3fc9b8e9 fix file mode bug 2014-04-04 00:08:30 -04:00
Joey Hess d19171ed53
propellor spin 2014-04-03 23:59:32 -04:00
Joey Hess 7932c5abec
propellor spin 2014-04-03 23:57:36 -04:00
Joey Hess fbc57d6845
propellor spin 2014-04-03 23:35:36 -04:00
Joey Hess ff49cf562c
propellor spin 2014-04-03 23:32:00 -04:00
Joey Hess b254cbbab1
propellor spin 2014-04-03 23:30:23 -04:00
Joey Hess 5499b2a612
propellor spin 2014-04-03 23:16:34 -04:00
Joey Hess 8868b44010
propellor spin 2014-04-03 23:13:05 -04:00
Joey Hess 869d4ab198
propellor spin 2014-04-03 22:47:31 -04:00
Joey Hess 1c381c5246 library shimming for docker (untested) 2014-04-03 21:22:37 -04:00
Joey Hess eea8637afe Merge branch 'joeyconfig' 2014-04-03 17:30:15 -04:00
Joey Hess 4996f12326 update 2014-04-03 17:30:15 -04:00
Joey Hess 90097577ae
propellor spin 2014-04-03 17:12:03 -04:00
Joey Hess ac480f6c85 Merge branch 'joeyconfig' 2014-04-03 14:07:32 -04:00
Joey Hess 680d480921 docs 2014-04-03 14:07:32 -04:00
Joey Hess 2f3cac42f3
propellor spin 2014-04-03 14:02:21 -04:00
Joey Hess b14b56d84a
propellor spin 2014-04-03 13:58:21 -04:00
Joey Hess e1c42aeeb1
propellor spin 2014-04-03 13:49:56 -04:00
Joey Hess 7c0b19218a Merge branch 'joeyconfig' 2014-04-03 13:49:33 -04:00
Joey Hess c764993cb3 improved remote and local provisioning 2014-04-03 13:49:26 -04:00
Joey Hess b9f32f4c1d
propellor spin 2014-04-03 12:35:52 -04:00
Joey Hess ced760359a Merge branch 'joeyconfig' 2014-04-03 12:35:27 -04:00
Joey Hess 9c3ab75059 fix 2014-04-03 12:35:27 -04:00
Joey Hess 8573c39d48
fix bootstrapping from a different branch than master 2014-04-03 12:33:55 -04:00
Joey Hess 492e4c68c8 better template 2014-04-03 12:26:27 -04:00
Joey Hess a8eecbca21
propellor spin 2014-04-03 12:21:44 -04:00
Joey Hess fc7b3893d1 clean up gpg droppings 2014-04-03 12:20:42 -04:00
Joey Hess f2ebd06873
propellor spin 2014-04-03 12:19:32 -04:00
Joey Hess 25ba6d5393 Merge branch 'joeyconfig' 2014-04-03 12:19:15 -04:00
Joey Hess 061c315156 update 2014-04-03 12:18:34 -04:00
Joey Hess d779159e73 add x back 2014-04-03 12:15:45 -04:00