[ARVADOS] updated: a7f96d94925721f6fe0be23fc626f00f05be635e

[git at public.curoverse.com]

Summary of changes:
 sdk/python/tests/run_test_server.py | 1 +
 services/keepstore/keepstore.go     | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

       via  a7f96d94925721f6fe0be23fc626f00f05be635e (commit)
      from  a0cc495afb2a207a176cb7b0b4df01aaf73c352a (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 a7f96d94925721f6fe0be23fc626f00f05be635e
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 3 11:26:12 2015 -0400

    6260: do not force never_delete in keepstore

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index d7739ac..4421262 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -337,6 +337,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False):
     with open(os.path.join(TEST_TMPDIR, "keep.data-manager-token-file"), "w") as f:
         keep_args['--data-manager-token-file'] = f.name
         f.write(os.environ['ARVADOS_API_TOKEN'])
+    keep_args['--never-delete'] = 'false'
 
     api = arvados.api(
         version='v1',
diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 3dfdce2..e55e0ef 100644
--- 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.")
 	}

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


hooks/post-receive
--