Reapply graceful socket shutdown on Windows (revert 29992a6a509)
1 patchset tracked - current t254115_1
v1t254115_1posted Oct 08, 20:32successneeds rebaserecent 8dpg 20
baseb28a2b2bf Oct 13, 20:33 on master
applyapplied Oct 13, 20:54
rebaselast tried about 16 hours ago on f2edf5dd0
Applying: Revert "Skip isolation tests that terminate other backends on Windows" Using index info to reconstruct a base tree... M contrib/test_decoding/Makefile M contrib/test_decoding/meson.build M src/test/modules/injection_points/Makefile M src/test/modules/injection_points/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/modules/injection_points/meson.build CONFLICT (content): Merge conflict in src/test/modules/injection_points/meson.build Auto-merging src/test/modules/injection_points/Makefile Auto-merging contrib/test_decoding/meson.build CONFLICT (content): Merge conflict in contrib/test_decoding/meson.build Auto-merging contrib/test_decoding/Makefile CONFLICT (content): Merge conflict in contrib/test_decoding/Makefile Patch failed at 0001 Revert "Skip isolation tests that terminate other backends on Windows" error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/modules/injection_points/meson.build, contrib/test_decoding/meson.build, contrib/test_decoding/Makefile
pushOct 13, 20:54 -> 8f92348ebbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1044 / 1044 | 1m 52s / 4m 26s | docker run ... :t254115 | Oct 13, 21:05 |
run 38466583271executed 1044 - ccache 78 hit / 6544 miss - head 8f92348eb - digest sha256:3a2f9dfe0e8f4f... - run 38466583271 | ||||||
| success | 1 | 20 | 1044 / 1044 | 1m 47s / 4m 20s | docker run ... @sha256:7c84cbd... | Oct 12, 20:57 |
run 38306596557executed 1044 - ccache 78 hit / 6544 miss - head aae083b23 - digest sha256:7c84cbdef1d877... - run 38306596557 | ||||||
| success | 1 | 20 | 1044 / 1044 | 2m 54s / 5m 22s | docker run ... @sha256:2772f3d... | Oct 11, 20:47 |
run 38172929447executed 1044 - ccache 78 hit / 6544 miss - head fbf2cd1ea - digest sha256:2772f3d1c1bdda... - run 38172929447 | ||||||
| success | 1 | 20 | 1044 / 1044 | 2m 53s / 5m 19s | docker run ... @sha256:6f183d6... | Oct 10, 20:46 |
run 38084368122executed 1044 - ccache 78 hit / 6544 miss - head 6a186e0f1 - digest sha256:6f183d6c9c8b80... - run 38084368122 | ||||||
| success | 1 | 20 | 1043 / 1043 | 2m 54s / 5m 37s | docker run ... @sha256:5ebd361... | Oct 09, 20:45 |
run 37987883932executed 1043 - ccache 78 hit / 6544 miss - head cd7b9ea19 - digest sha256:5ebd361a6bba6c... - run 37987883932 | ||||||
| success | 1 | 20 | 1042 / 1042 | 2m 51s / 5m 19s | docker run ... @sha256:3afdf51... | Oct 08, 20:45 |
run 37840428084executed 1042 - ccache 78 hit / 6544 miss - head 8e200518a - digest sha256:3afdf51da3d4db... - run 37840428084 | ||||||