Allow auto_explain to log to NOTICE

back to CI dashboard

1 patchset tracked - current t38617_12

v12t38617_12posted Oct 30, 2018successwon't retryancient 8ypg 12
basec03c1449c Oct 03, 2018 - 2908 days / 19732 commits behind master (from history)
applyapplied Aug 18, 16:39
rebaselast tried Aug 18, 16:39 on 195e8e427
Applying: Add costs and duration options to auto_explain
Using index info to reconstruct a base tree...
M	contrib/auto_explain/Makefile
M	contrib/auto_explain/auto_explain.c
M	doc/src/sgml/auto-explain.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/auto-explain.sgml
Auto-merging contrib/auto_explain/auto_explain.c
CONFLICT (content): Merge conflict in contrib/auto_explain/auto_explain.c
Auto-merging contrib/auto_explain/Makefile
CONFLICT (content): Merge conflict in contrib/auto_explain/Makefile
Patch failed at 0001 Add costs and duration options to auto_explain

/ci/repo/worktrees/worktree/rebase-apply/patch:200: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
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: contrib/auto_explain/auto_explain.c, contrib/auto_explain/Makefile
pushAug 18, 16:39 -> 3a064fa03branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success112515 / 5151m 53s / 2m 38sdocker run ... :t38617Aug 18, 16:48
run 32161440407
executed 515 - ccache 156 hit / 3947 miss - head 3a064fa03 - digest sha256:da2f7f0e87d3b1... - run 32161440407