tree 67289614dd7e10fd34c77ec923fb16f04360af1c
parent fc480b3efcb7264ffc331aaf0243404f6499d7f8
parent 1e170b16a4e8cfc17e67cd406f8d0cabe2f58cfd
author David Pursehouse <david.pursehouse@gmail.com> 1537229914 +0900
committer David Pursehouse <david.pursehouse@gmail.com> 1537229920 +0900

Merge branch 'stable-4.11' into stable-5.0

* stable-4.11:
  Fix ObjectUploadListener#close
  Fix error handling in FileLfsServlet
  ObjectDownloadListener#onWritePossible: Make code spec compatible
  ObjectDownloadListener: Return from onWritePossible when data is written
  Fix IOException when LockToken#close fails

Change-Id: Iffe202a412b3bca1c8d8d7dc5dfd646c49838de9
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>