14 Commits

Author	SHA1	Message	Date
Philip Monk	67c5caada8	clay: add safe merge options ... As described in gen/hood/merge/help.txt	2020-08-28 16:36:00 -07:00
Philip Monk	3d1b7f2b35	clay: fix ph tests	2020-07-28 21:44:45 -07:00
Liam Fitzgerald	8cf81002ec	Merge branch 'ford-fusion' into lf/groups-refactor	2020-06-23 12:13:03 +10:00
Liam Fitzgerald	841ba72bd9	chat: update to new groups	2020-06-02 15:20:14 +10:00
Liam Fitzgerald	d2de8d72eb	groups: begin rewrite	2020-06-02 15:07:09 +10:00
Philip Monk	25bd1340f6	ph: update breach-sync now that %base is gone	2020-05-22 00:30:15 -07:00
Philip Monk	4aff4d74e2	kiln: get updates into %home, remove %base ... We need to get updates directly into %home in case the marks depend on changes to hoon.hoon. %base has no reason to exist. Our ota strategy is now to merge from parent/kids to home, then parent/kids to kids.	2020-05-21 23:45:17 -07:00
Philip Monk	e5ac690fd3	jael: re-enable ship-to-ship communication ... Also fix bug in eth-watcher that didn't cancel outstanding threads when config changes. And set default rift for ourselves to 0.	2019-12-17 16:14:07 -08:00
Ted Blackman	077bad8c4d	ph: fix -hi-comet-az and comet spawning	2019-11-30 23:14:31 -05:00
Ted Blackman	3f550d669e	Merge remote-tracking branch 'origin/philip/mall-real' into mall-testnet	2019-11-26 20:20:23 -05:00
Ted Blackman	f781837ffa	ph: comet test passes; also update solid pill	2019-11-26 15:38:29 -05:00
Philip Monk	f8b612d053	ph: add ph-all to run multiple tests	2019-11-22 12:46:30 -08:00
Philip Monk	2222237385	ph: add alef tests	2019-11-19 14:10:00 -08:00
Philip Monk	7837d51aba	spider: rename thread -> strand, imp -> thread	2019-11-16 04:07:09 -08:00