[ARVADOS] updated: 1.1.3-226-gd63d7dc

[Git user]

Summary of changes:
 services/keepstore/handlers.go         | 4 ++--
 services/keepstore/pull_worker_test.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  d63d7dc79ed74beaaceda15ca88344de12258da3 (commit)
      from  41e612b59ad85ee7f22ebf3239ec8ff1cbb463c5 (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 d63d7dc79ed74beaaceda15ca88344de12258da3
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Mar 23 13:18:50 2018 -0400

    7931: Update json field tags on trash/pull requests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 258604c..8b37b90 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -514,7 +514,7 @@ type PullRequest struct {
 	Servers []string `json:"servers"`
 
 	// Destination mount, or "" for "anywhere"
-	MountUUID string
+	MountUUID string `json:"mount_uuid"`
 }
 
 // PullHandler processes "PUT /pull" requests for the data manager.
@@ -553,7 +553,7 @@ type TrashRequest struct {
 	BlockMtime int64  `json:"block_mtime"`
 
 	// Target mount, or "" for "everywhere"
-	MountUUID string
+	MountUUID string `json:"mount_uuid"`
 }
 
 // TrashHandler processes /trash requests.
diff --git a/services/keepstore/pull_worker_test.go b/services/keepstore/pull_worker_test.go
index 7a82970..7b5077c 100644
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -127,7 +127,7 @@ func (s *PullWorkerTestSuite) TestSpecifyMountUUID(c *C) {
 			requestBody: []byte(`[{
 				"locator":"acbd18db4cc2f85cedef654fccc4a4d8+3",
 				"servers":["server_1","server_2"],
-				"mountuuid":"` + spec.sendUUID + `"}]`),
+				"mount_uuid":"` + spec.sendUUID + `"}]`),
 		})
 		c.Assert(resp.Code, Equals, http.StatusOK)
 		expectEqualWithin(c, time.Second, 0, func() interface{} {

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


hooks/post-receive
--