Merge remote-tracking branch 'origin/UnhappyPathAndPaceMaker' into UnhappyPathAndPaceMaker

# Conflicts: # carnot/spec.md
2023-03-22 20:45:15 -07:00 · 2023-03-22 20:45:15 -07:00 · f1f14bc487
parent f9c35b00d2
commit f1f14bc487
1 changed files with 1 additions and 1 deletions
--- a/carnot/spec.md
+++ b/carnot/spec.md
@ -449,7 +449,7 @@ def increment_view_timeout_qc (timeout_qc: Timeout_qc):
    if timeout_qc==None or timeout_qc.view < CURRENT_VIEW:
        return false
    LAST_VIEW_TIMEOUT_QC = timeout_qc
-    start_timer(qc.view+1)
+    start_timer(timeout_qc.view+1)
    return true
 ```