[ARVADOS] updated: 7e381812b8894358cf8371729155acfd0b66aa61

[Git user]

Summary of changes:
 services/keepstore/keepstore.go | 2 +-
 services/keepstore/s3_volume.go | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

       via  7e381812b8894358cf8371729155acfd0b66aa61 (commit)
      from  7497b21c937bb6e8451f16047945b7cfc9081a53 (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 7e381812b8894358cf8371729155acfd0b66aa61
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 30 12:00:48 2016 -0400

    9700: Remove "trashLifetime != 0 is not supported in S3" check, now that it is supported.
    
    refs #9700

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 00f7b3c..48b83de 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -223,7 +223,7 @@ func main() {
 	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,
diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go
index 1f62f4a..1a2a47b 100644
--- a/services/keepstore/s3_volume.go
+++ b/services/keepstore/s3_volume.go
@@ -43,9 +43,6 @@ type s3VolumeAdder struct {
 }
 
 func (s *s3VolumeAdder) Set(bucketName string) error {
-	if trashLifetime != 0 {
-		return ErrNotImplemented
-	}
 	if bucketName == "" {
 		return fmt.Errorf("no container name given")
 	}

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


hooks/post-receive
--