Optional message to user when terminating/cancelling backend
1 patchset tracked - current t36959_76
v76t36959_76posted Oct 30, 2018successwon't retryancient 8ypg 12
based5eec4eef Oct 30, 2018 - 2882 days / 19611 commits behind master (from history)
applyapplied Aug 18, 16:37
rebaselast tried Aug 18, 16:37 on 195e8e427
Applying: Add infrastructure for signalling backends with payload Using index info to reconstruct a base tree... M src/backend/storage/ipc/Makefile M src/backend/storage/ipc/ipci.c M src/backend/utils/init/postinit.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/init/postinit.c CONFLICT (content): Merge conflict in src/backend/utils/init/postinit.c Auto-merging src/backend/storage/ipc/ipci.c CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c Auto-merging src/backend/storage/ipc/Makefile CONFLICT (content): Merge conflict in src/backend/storage/ipc/Makefile Patch failed at 0001 Add infrastructure for signalling backends with payload 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/backend/utils/init/postinit.c, src/backend/storage/ipc/ipci.c, src/backend/storage/ipc/Makefile
pushAug 18, 16:37 -> b4f5b3f1abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 12 | 515 / 515 | 1m 56s / 2m 39s | docker run ... :t36959 | Aug 18, 16:47 |
run 32161288450executed 515 - ccache 157 hit / 3947 miss - head b4f5b3f1a - digest sha256:0d05c3a4e8b54e... - run 32161288450 | ||||||