Merge remote-tracking branch 'origin/UnhappyPathAndPaceMaker' into UnhappyPathAndPaceMaker
# Conflicts: # carnot/spec.md
This commit is contained in:
commit
a5d5298424
|
@ -449,7 +449,7 @@ def increment_view_timeout_qc (timeout_qc: Timeout_qc):
|
||||||
if timeout_qc==None or timeout_qc.view < CURRENT_VIEW:
|
if timeout_qc==None or timeout_qc.view < CURRENT_VIEW:
|
||||||
return false
|
return false
|
||||||
LAST_VIEW_TIMEOUT_QC = timeout_qc
|
LAST_VIEW_TIMEOUT_QC = timeout_qc
|
||||||
start_timer(timeout_qc.view+1)
|
start_timer(qc.view+1)
|
||||||
return true
|
return true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue