cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,739 Commits 1 Branch 0 Tags 6.6 MiB
Commit Graph

2739 Commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmtnXa0F3OsNh8H7yf5EEbtuufPZG-3StI 240cbe4c61 Added a comment: Remote host fails to connect 2014-08-30 06:40:33 +00:00
Joey Hess d968da96f3
propellor spin 2014-08-29 16:24:16 -07:00
Joey Hess 7499ab41a5
propellor spin 2014-08-29 16:22:51 -07:00
Joey Hess bdbbee21f8
propellor spin 2014-08-29 16:21:57 -07:00
Joey Hess 859c0c8017
propellor spin 2014-08-29 16:19:30 -07:00
Joey Hess 0c0c9d9a7f
propellor spin 2014-08-29 16:17:28 -07:00
Joey Hess 0af697a649
propellor spin 2014-08-29 16:14:09 -07:00
Joey Hess 4c7f8bc8a3
propellor spin 2014-08-29 16:09:12 -07:00
Joey Hess 69873e484e
propellor spin 2014-08-29 16:07:18 -07:00
http://joeyh.name/ 8a4f2aa0f5 Added a comment 2014-08-29 21:52:02 +00:00
Joey Hess 7e64ee7334 typo 2014-08-29 14:51:47 -07:00
https://www.google.com/accounts/o8/id?id=AItOawmtnXa0F3OsNh8H7yf5EEbtuufPZG-3StI 99465c7b8b Added a comment: Is it ok to publish to a public repository? 2014-08-29 21:13:19 +00:00
Joey Hess 4c1c41d1a2 reorg 2014-08-29 10:30:48 -07:00
Joey Hess 70e1df98c5
propellor spin 2014-08-29 09:34:45 -07:00
Joey Hess 4a244b04c0
propellor spin 2014-08-29 09:33:24 -07:00
Joey Hess 4f92a77e82 debCdn switched from cdn.debian.net to http.debian.net, which seems to be better managed now. 2014-08-23 13:19:27 -07:00
Joey Hess 9b37a5ef03 add news item for propellor 0.8.3 2014-08-22 13:04:08 -04:00
Joey Hess a67beb7118 Merge branch 'joeyconfig' 2014-08-22 13:02:21 -04:00
Joey Hess 7ff8d0f8a2 prep release 2014-08-22 13:02:18 -04:00
Joey Hess 59f94154b5 Merge branch 'joeyconfig' 2014-08-22 13:01:54 -04:00
Joey Hess 3cb9a60f89
propellor spin 2014-08-21 15:52:49 -04:00
Joey Hess 0929cad092 comments 2014-08-21 14:12:23 -04:00
Joey Hess 3822c9a2d7
propellor spin 2014-08-21 14:04:26 -04:00
Joey Hess 1c6245cef8 Merge branch 'joeyconfig' 2014-08-19 19:23:16 -04:00
Joey Hess ceb56ac32b keep warning of out of date after updating upstream/master, until it gets merged 2014-08-19 19:22:54 -04:00
Joey Hess 94b7c9d298 Merge branch 'joeyconfig' 2014-08-19 19:06:30 -04:00
Joey Hess 81544b37a8 fix man page installation 2014-08-19 19:06:21 -04:00
Joey Hess 0ad5b6e410 Merge branch 'joeyconfig' 2014-08-19 19:03:29 -04:00
Joey Hess db1cf96dd7 remove origin remote after local clone 
It's not useful, since it'll change to something that cannot be directly
merged with.
 2014-08-19 19:03:05 -04:00
Joey Hess 11c1160655 reorg manpage 2014-08-19 18:06:00 -04:00
Joey Hess 95f89280dd Merge branch 'joeyconfig' 2014-08-19 17:59:20 -04:00
Joey Hess d6320b8130 -X 2014-08-19 17:59:15 -04:00
Joey Hess c929541073 Merge branch 'joeyconfig' 2014-08-19 17:57:52 -04:00
Joey Hess 5d92ed6ea7 need to -s theirs or the merge is likely to fail 2014-08-19 17:57:32 -04:00
Joey Hess c0cc5d214b Merge branch 'joeyconfig' 2014-08-19 17:55:37 -04:00
Joey Hess d289a222d5 simpler merge 
Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suitable for mergeing into the user's repo. No need for
manual diff, which can fail on eg, binaries or no changes.
 2014-08-19 17:54:49 -04:00
Joey Hess 4634f3cf47 Merge branch 'joeyconfig' 2014-08-19 17:51:43 -04:00
Joey Hess adf8b2ec34 need to connect up history 2014-08-19 17:51:34 -04:00
Joey Hess 845877a44a Merge branch 'joeyconfig' 2014-08-19 17:34:29 -04:00
Joey Hess 6f8f0c1c6b beargN 2014-08-19 17:34:25 -04:00
Joey Hess 7e069973f8 Merge branch 'joeyconfig' 2014-08-19 17:33:07 -04:00
Joey Hess 7a34a1efbf merge from master 2014-08-19 17:33:00 -04:00
Joey Hess 25312ae18b Merge branch 'joeyconfig' 2014-08-19 17:31:15 -04:00
Joey Hess 215a8e7f0e merge from master 2014-08-19 17:31:09 -04:00
Joey Hess 5160041df9 Merge branch 'joeyconfig' 
Conflicts:
	Makefile
 2014-08-19 17:30:34 -04:00
Joey Hess 4766442124 bleargh45678etc 2014-08-19 17:30:10 -04:00
Joey Hess eff0fe5dff bleargh3 2014-08-19 17:25:05 -04:00
Joey Hess afe75ef651 Merge branch 'joeyconfig' 2014-08-19 17:24:20 -04:00
Joey Hess 5365334ac2 double bleargh 2014-08-19 17:24:13 -04:00
Joey Hess 33f2e899d2 Merge branch 'joeyconfig' 2014-08-19 17:22:18 -04:00