[ARVADOS] updated: 66d5eced4d69a5c35ba4288ab46a67d906379a71

[git at public.curoverse.com]

Summary of changes:
 services/api/config/application.yml.example | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  66d5eced4d69a5c35ba4288ab46a67d906379a71 (commit)
      from  6a86061651165186cfa49af41c6f7f856fee267e (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 66d5eced4d69a5c35ba4288ab46a67d906379a71
Author: Tim Pierce <twp at curoverse.com>
Date:   Mon May 19 18:17:29 2014 -0400

    2755: fix merge conflicts (refs #2755)

diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index bfa63c8..e0420ce 100644
--- 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

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


hooks/post-receive
--