[ARVADOS] updated: 1.3.0-617-g82d4b7576

[Git user]

Summary of changes:
 services/keepproxy/keepproxy.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  82d4b75769f5cc33001dcc016762651a911f7297 (commit)
       via  e289702131cc103f1e14d94ed49bdc62e0d5d8d7 (commit)
      from  a60f73b173ee31d49f41137ce67930d60a25ea6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 82d4b75769f5cc33001dcc016762651a911f7297
Merge: a60f73b17 e28970213
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Apr 1 11:16:58 2019 -0400

    Merge branch '14758-keepproxy-panic'
    
    fixes #14758
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit e289702131cc103f1e14d94ed49bdc62e0d5d8d7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Apr 1 10:40:43 2019 -0400

    14758: Fix panic on error reading request body.
    
    The deferred inline func panics if status != 200 && err == nil.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index fc4783eff..0cb93ffb3 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -541,7 +541,7 @@ func (h *proxyHandler) Put(resp http.ResponseWriter, req *http.Request) {
 	if locatorIn == "" {
 		bytes, err2 := ioutil.ReadAll(req.Body)
 		if err2 != nil {
-			_ = errors.New(fmt.Sprintf("Error reading request body: %s", err2))
+			err = fmt.Errorf("Error reading request body: %s", err2)
 			status = http.StatusInternalServerError
 			return
 		}

-----------------------------------------------------------------------


hooks/post-receive
--