From: Tom Clegg <tom@curoverse.com>
Date: Mon, 16 Jan 2017 16:13:32 +0000 (-0500)
Subject: Merge branch 'master' into 9998-no-count-items-available
X-Git-Tag: 1.1.0~454^2~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/609646134bcd8fc3a7fd500848220741ecc4a9d2

Merge branch 'master' into 9998-no-count-items-available

Conflicts:
	sdk/go/arvados/resource_list.go
	services/keep-balance/collection.go
---

609646134bcd8fc3a7fd500848220741ecc4a9d2
diff --cc sdk/go/arvados/resource_list.go
index 2864307ebf,242fb7e406..0cc665807b
--- a/sdk/go/arvados/resource_list.go
+++ b/sdk/go/arvados/resource_list.go
@@@ -5,13 -5,12 +5,14 @@@ import "encoding/json
  // ResourceListParams expresses which results are requested in a
  // list/index API.
  type ResourceListParams struct {
- 	Select   []string `json:"select,omitempty"`
- 	Filters  []Filter `json:"filters,omitempty"`
- 	Limit    *int     `json:"limit,omitempty"`
- 	Offset   int      `json:"offset,omitempty"`
- 	Order    string   `json:"order,omitempty"`
- 	Distinct bool     `json:"distinct,omitempty"`
- 	Count    bool     `json:"count,omitempty"`
+ 	Select       []string `json:"select,omitempty"`
+ 	Filters      []Filter `json:"filters,omitempty"`
+ 	IncludeTrash bool     `json:"include_trash,omitempty"`
+ 	Limit        *int     `json:"limit,omitempty"`
+ 	Offset       int      `json:"offset,omitempty"`
+ 	Order        string   `json:"order,omitempty"`
++	Distinct     bool     `json:"distinct,omitempty"`
++	Count        bool     `json:"count,omitempty"`
  }
  
  // A Filter restricts the set of records returned by a list/index API.
diff --cc services/keep-balance/collection.go
index 060621b771,b3a631e979..15556ed612
--- a/services/keep-balance/collection.go
+++ b/services/keep-balance/collection.go
@@@ -42,10 -43,10 +44,11 @@@ func EachCollection(c *arvados.Client, 
  		limit = 1<<31 - 1
  	}
  	params := arvados.ResourceListParams{
- 		Limit:  &limit,
- 		Order:  "modified_at, uuid",
- 		Count:  false,
- 		Select: []string{"uuid", "manifest_text", "modified_at", "portable_data_hash", "replication_desired"},
+ 		Limit:        &limit,
+ 		Order:        "modified_at, uuid",
++		Count:        false,
+ 		Select:       []string{"uuid", "unsigned_manifest_text", "modified_at", "portable_data_hash", "replication_desired"},
+ 		IncludeTrash: true,
  	}
  	var last arvados.Collection
  	var filterTime time.Time