2755: fix merge conflicts (refs #2755)

diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index bfa63c84a99ff6bfc704b02aab0c5a229b44c3f1..e0420ce076145a8a776aa7dbc4c27085a0cc94f0 100644 (file)
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -47,8 +47,11 @@ production:
 test:
   uuid_prefix: zzzzz
   secret_token: <%= rand(2**512).to_s(36) %>
-  permission_key: <%= rand(2**512).to_s(36) %>
 
 common:
   #git_repositories_dir: /var/cache/git
   #git_internal_dir: /var/cache/arvados/internal.git
+
+  # Amount of time (in seconds) for which a blob permission signature
+  # remains valid.  Default: 2 weeks (1209600 seconds)
+  #blob_signing_ttl: 1209600