projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10259-cwl-pipeline-value' refs #10259
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index 00f7b3ce150e2171365644ebc9ea34c2921d0aa9..a04bc0b6fdf93296846ee5be48ffac46b535106f 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-130,6
+130,9
@@
var (
)
func (vs *volumeSet) String() string {
)
func (vs *volumeSet) String() string {
+ if vs == nil {
+ return "[]"
+ }
return fmt.Sprintf("%+v", (*vs)[:])
}
return fmt.Sprintf("%+v", (*vs)[:])
}
@@
-223,7
+226,7
@@
func main() {
flag.DurationVar(
&trashLifetime,
"trash-lifetime",
flag.DurationVar(
&trashLifetime,
"trash-lifetime",
- 0
*time.Second
,
+ 0,
"Time duration after a block is trashed during which it can be recovered using an /untrash request")
flag.DurationVar(
&trashCheckInterval,
"Time duration after a block is trashed during which it can be recovered using an /untrash request")
flag.DurationVar(
&trashCheckInterval,