[ARVADOS] updated: cffa542e4cb069b40764c889613c249e88af62d0

[Git user]

Summary of changes:
 services/datamanager/collection/collection.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

       via  cffa542e4cb069b40764c889613c249e88af62d0 (commit)
       via  df8d0badeb97036564a80e89569c8e62ede22163 (commit)
      from  7a430017d745cab4458aa03f620e7925a50b7d06 (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 cffa542e4cb069b40764c889613c249e88af62d0
Merge: 7a43001 df8d0ba
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 20 10:01:55 2016 -0400

    Merge branch 'wtsi-hgi-9231-rename-redunancy-to-replication-desired'
    
    closes #9231


commit df8d0badeb97036564a80e89569c8e62ede22163
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Wed May 18 14:35:37 2016 +0100

    Renames 'redundancy' to 'replication_desired'

diff --git a/services/datamanager/collection/collection.go b/services/datamanager/collection/collection.go
index c392ded..55b3f61 100644
--- a/services/datamanager/collection/collection.go
+++ b/services/datamanager/collection/collection.go
@@ -49,11 +49,11 @@ type GetCollectionsParams struct {
 
 // SdkCollectionInfo holds collection info from api
 type SdkCollectionInfo struct {
-	UUID         string    `json:"uuid"`
-	OwnerUUID    string    `json:"owner_uuid"`
-	Redundancy   int       `json:"redundancy"`
-	ModifiedAt   time.Time `json:"modified_at"`
-	ManifestText string    `json:"manifest_text"`
+	UUID                 string    `json:"uuid"`
+	OwnerUUID            string    `json:"owner_uuid"`
+	ReplicationDesired   int       `json:"replication_desired"`
+	ModifiedAt           time.Time `json:"modified_at"`
+	ManifestText         string    `json:"manifest_text"`
 }
 
 // SdkCollectionList lists collections from api
@@ -125,7 +125,7 @@ func GetCollections(params GetCollectionsParams) (results ReadCollections, err e
 	fieldsWanted := []string{"manifest_text",
 		"owner_uuid",
 		"uuid",
-		"redundancy",
+		"replication_desired",
 		"modified_at"}
 
 	sdkParams := arvadosclient.Dict{
@@ -297,7 +297,7 @@ func ProcessCollections(arvLogger *logger.Logger,
 	for _, sdkCollection := range receivedCollections {
 		collection := Collection{UUID: StrCopy(sdkCollection.UUID),
 			OwnerUUID:         StrCopy(sdkCollection.OwnerUUID),
-			ReplicationLevel:  sdkCollection.Redundancy,
+			ReplicationLevel:  sdkCollection.ReplicationDesired,
 			BlockDigestToSize: make(map[blockdigest.BlockDigest]int)}
 
 		if sdkCollection.ModifiedAt.IsZero() {

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


hooks/post-receive
--