Merge branch 'master' into 6260-test-datamanager

[arvados.git] / services / keepstore / keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 3dfdce20e321bfe61ffb9b9f119e10f189ee2c48..e55e0ef841495724b26a4e89cdf84e11d0051a7e 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -288,10 +288,6 @@ func main() {
 
        flag.Parse()
 
-       if never_delete != true {
-               log.Fatal("never_delete must be true, see #6221")
-       }
-
        if maxBuffers < 0 {
                log.Fatal("-max-buffers must be greater than zero.")
        }