Commit Graph

36 Commits

Author SHA1 Message Date
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 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 f83a2a0829 point back at config-simple
This will be the new master branch. This way I can develop on joeyh and
merge joeyh to master to publish it, while keeping master using
config-simple
2014-04-03 12:09:21 -04:00
Joey Hess 0b3fed7bbe
on this branch, repoint the symlink at config-joeyh.hs 2014-04-03 12:07:31 -04:00
Joey Hess 5a94d48f3a reorg configs 2014-04-03 12:06:58 -04:00
Joey Hess d4b89d7c53 improve 2014-04-03 11:59:25 -04:00
Joey Hess 6e325dbf8f
propellor spin 2014-04-02 23:14:18 -04:00
Joey Hess 5df3ad13df awesome new revert operator! 2014-04-02 23:01:40 -04:00
Joey Hess cd10ceb976
generalized git-annex autobuilder to not need a rsync password 2014-04-02 18:36:42 -04:00
Joey Hess 6456ce3cc0
propellor spin 2014-04-02 13:30:25 -04:00
Joey Hess deeb98dc23
propellor spin 2014-04-02 13:29:21 -04:00
Joey Hess 9bb0d98054
propellor spin 2014-04-02 13:19:02 -04:00
Joey Hess 526bcbf093 type-safe reversions 2014-04-02 13:18:08 -04:00
Joey Hess 6f032f7ee3
propellor spin 2014-04-02 00:52:39 -04:00
Joey Hess 845162a2b1
propellor spin 2014-04-02 00:36:16 -04:00
Joey Hess 3fae22e95b changed Arch to String type 2014-04-01 23:49:15 -04:00
Joey Hess 4b899747c8
propellor spin 2014-04-01 23:26:26 -04:00
Joey Hess f3f2af29f2 docker gc 2014-04-01 23:24:31 -04:00
Joey Hess 60960d7853
propellor spin 2014-04-01 19:33:06 -04:00
Joey Hess 548f0dd50b add a simpler version of config.hs 2014-04-01 18:56:56 -04:00
Joey Hess 3ea5a38395
propellor spin 2014-04-01 18:06:02 -04:00
Joey Hess b70422c8cf fix desc for combineProperties 2014-04-01 17:32:37 -04:00
Joey Hess e6d24b49b8 various improvements 2014-04-01 16:58:11 -04:00
Joey Hess f7bcedca6f
test port change 2014-04-01 14:54:06 -04:00
Joey Hess 1af0cb35b6 tweak 2014-04-01 12:42:24 -04:00
Joey Hess e02f802ac8 add PROPELLOR_DEBUG 2014-04-01 11:59:48 -04:00
Joey Hess 90f86b8b2b not quite working docker container interface 2014-04-01 01:12:05 -04:00
Joey Hess a020b66fcb
propellor spin 2014-03-31 19:22:49 -04:00
Joey Hess 0605b00128 propellor spin 2014-03-31 10:52:46 -04:00
Joey Hess ad9940bd14 propellor spin 2014-03-31 10:43:51 -04:00
Joey Hess 51fc590b61 propellor spin 2014-03-31 01:29:47 -04:00
Joey Hess 2100a0349a propellor spin 2014-03-31 01:16:01 -04:00
Joey Hess ed681de096 propellor spin 2014-03-31 01:13:08 -04:00
Joey Hess 0515fcb0f9 more prep 2014-03-30 23:59:07 -04:00