Skip to content

Commit 3ce8d59

Browse files
davepachecodavepacheco
committed
fixup conflict
1 parent d2b1f68 commit 3ce8d59

File tree

1 file changed

+0
-58
lines changed

1 file changed

+0
-58
lines changed

‎dev-tools/omdb/tests/successes.out

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,7 @@ task: "nat_garbage_collector"
489489

490490
task: "blueprint_loader"
491491
configured period: every <REDACTED_DURATION>m <REDACTED_DURATION>s
492-
<<<<<<< HEAD
493492
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
494-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
495-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
496-
=======
497-
last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
498-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
499493
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
500494
target blueprint: ......<REDACTED_BLUEPRINT_ID>.......
501495
execution: disabled
@@ -504,13 +498,7 @@ task: "blueprint_loader"
504498

505499
task: "blueprint_executor"
506500
configured period: every <REDACTED_DURATION>m
507-
<<<<<<< HEAD
508501
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
509-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
510-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
511-
=======
512-
last completed activation: <REDACTED ITERATIONS>, triggered by a dependent task completing
513-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
514502
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
515503
target blueprint: ......<REDACTED_BLUEPRINT_ID>.......
516504
execution: disabled
@@ -570,13 +558,7 @@ warning: unknown background task: "chicken_switches_watcher" (don't know how to
570558

571559
task: "crdb_node_id_collector"
572560
configured period: every <REDACTED_DURATION>m
573-
<<<<<<< HEAD
574561
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
575-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
576-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
577-
=======
578-
last completed activation: <REDACTED ITERATIONS>, triggered by a dependent task completing
579-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
580562
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
581563
warning: unknown background task: "crdb_node_id_collector" (don't know how to interpret details: Object {"errors": Array [Object {"err": String("failed to fetch node ID for zone ..........<REDACTED_UUID>........... at http://[::1]:REDACTED_PORT: Communication Error: error sending request for url (http://[::1]:REDACTED_PORT/node/id): error sending request for url (http://[::1]:REDACTED_PORT/node/id): client error (Connect): tcp connect error: Connection refused (os error <OS_ERROR_REDACTED>)"), "zone_id": String("..........<REDACTED_UUID>...........")}], "nsuccess": Number(0)})
582564

@@ -877,15 +859,7 @@ termination: Exited(0)
877859
stdout:
878860
task: "blueprint_loader"
879861
configured period: every <REDACTED_DURATION>m <REDACTED_DURATION>s
880-
<<<<<<< HEAD
881862
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
882-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
883-
currently executing: no
884-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
885-
=======
886-
currently executing: no
887-
last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
888-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
889863
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
890864
target blueprint: ......<REDACTED_BLUEPRINT_ID>.......
891865
execution: disabled
@@ -894,15 +868,7 @@ task: "blueprint_loader"
894868

895869
task: "blueprint_executor"
896870
configured period: every <REDACTED_DURATION>m
897-
<<<<<<< HEAD
898871
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
899-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
900-
currently executing: no
901-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
902-
=======
903-
currently executing: no
904-
last completed activation: <REDACTED ITERATIONS>, triggered by a dependent task completing
905-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
906872
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
907873
target blueprint: ......<REDACTED_BLUEPRINT_ID>.......
908874
execution: disabled
@@ -1041,15 +1007,7 @@ task: "nat_garbage_collector"
10411007

10421008
task: "blueprint_loader"
10431009
configured period: every <REDACTED_DURATION>m <REDACTED_DURATION>s
1044-
<<<<<<< HEAD
10451010
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
1046-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
1047-
currently executing: no
1048-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
1049-
=======
1050-
currently executing: no
1051-
last completed activation: <REDACTED ITERATIONS>, triggered by an explicit signal
1052-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
10531011
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
10541012
target blueprint: ......<REDACTED_BLUEPRINT_ID>.......
10551013
execution: disabled
@@ -1058,15 +1016,7 @@ task: "blueprint_loader"
10581016

10591017
task: "blueprint_executor"
10601018
configured period: every <REDACTED_DURATION>m
1061-
<<<<<<< HEAD
10621019
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
1063-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
1064-
currently executing: no
1065-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
1066-
=======
1067-
currently executing: no
1068-
last completed activation: <REDACTED ITERATIONS>, triggered by a dependent task completing
1069-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
10701020
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
10711021
target blueprint: ......<REDACTED_BLUEPRINT_ID>.......
10721022
execution: disabled
@@ -1126,15 +1076,7 @@ warning: unknown background task: "chicken_switches_watcher" (don't know how to
11261076

11271077
task: "crdb_node_id_collector"
11281078
configured period: every <REDACTED_DURATION>m
1129-
<<<<<<< HEAD
11301079
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
1131-
||||||| parent of 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
1132-
currently executing: no
1133-
last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
1134-
=======
1135-
currently executing: no
1136-
last completed activation: <REDACTED ITERATIONS>, triggered by a dependent task completing
1137-
>>>>>>> 127d5a805 (add the "second" Nexus to the test suite blueprint; fix omdb tests)
11381080
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
11391081
warning: unknown background task: "crdb_node_id_collector" (don't know how to interpret details: Object {"errors": Array [Object {"err": String("failed to fetch node ID for zone ..........<REDACTED_UUID>........... at http://[::1]:REDACTED_PORT: Communication Error: error sending request for url (http://[::1]:REDACTED_PORT/node/id): error sending request for url (http://[::1]:REDACTED_PORT/node/id): client error (Connect): tcp connect error: Connection refused (os error <OS_ERROR_REDACTED>)"), "zone_id": String("..........<REDACTED_UUID>...........")}], "nsuccess": Number(0)})
11401082

0 commit comments

Comments
 (0)