mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-01 03:23:09 +03:00
Merge branch 'next/kelvin/412' into yu/fix-drop-nack-state
This commit is contained in:
commit
3b9a22bb5c
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a5a31c4f3566eb7243b3a596ef9103eb8ef896e62c9cddd4f515429837734805
|
oid sha256:8f26569c70bdf4950323c9578c602e5b5cea9da57131ce0a8ccc7fee7a26cde8
|
||||||
size 7275204
|
size 6739960
|
||||||
|
@ -148,7 +148,7 @@
|
|||||||
=/ ships ~(tap in ships.state)
|
=/ ships ~(tap in ships.state)
|
||||||
|- ^- (quip card _state)
|
|- ^- (quip card _state)
|
||||||
?~ ships `state
|
?~ ships `state
|
||||||
?: =(our i.ships) `state
|
?: =(our i.ships) $(ships t.ships)
|
||||||
;< new-state=_state rind (send-ping i.ships)
|
;< new-state=_state rind (send-ping i.ships)
|
||||||
=. state new-state
|
=. state new-state
|
||||||
$(ships t.ships)
|
$(ships t.ships)
|
||||||
|
@ -558,6 +558,7 @@
|
|||||||
:: cong: parameters for marking a flow as clogged
|
:: cong: parameters for marking a flow as clogged
|
||||||
::
|
::
|
||||||
+$ ames-state
|
+$ ames-state
|
||||||
|
$+ ames-state
|
||||||
$: peers=(map ship ship-state)
|
$: peers=(map ship ship-state)
|
||||||
=unix=duct
|
=unix=duct
|
||||||
=life
|
=life
|
||||||
@ -1175,6 +1176,7 @@
|
|||||||
:: $queued-event: event to be handled after initial boot completes
|
:: $queued-event: event to be handled after initial boot completes
|
||||||
::
|
::
|
||||||
+$ queued-event
|
+$ queued-event
|
||||||
|
$+ queued-event
|
||||||
$% [%call =duct wrapped-task=(hobo task)]
|
$% [%call =duct wrapped-task=(hobo task)]
|
||||||
[%take =wire =duct =sign]
|
[%take =wire =duct =sign]
|
||||||
==
|
==
|
||||||
|
Loading…
Reference in New Issue
Block a user