tree 6fe8b67a655f608d2a9b8dc4c9a2a08c17293cf7
parent d0977d135ea39ed14ee8a0013f07a7bafab05c44
parent eeb4e04b29b51c66669766f7782e917ff806351f
author David Pursehouse <dpursehouse@collab.net> 1579604258 +0900
committer David Pursehouse <dpursehouse@collab.net> 1579604258 +0900

Merge branch 'stable-3.1'

* stable-3.1:
  Switch off intraline diffs for some cases (invalid cache key sharing)
  Fix an internal server error when diffing patch sets (non-merge commit)
  Set HTTP thread name to describe the request it is processing

Change-Id: Iaeb832f448bdaef5b146164943684035fe777b62