Merge branch '15232-blobttl-suffix'

fixes #15232

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --cc lib/config/config.default.yml
index e41f7508b5582ed223eb325b0f0ecdacba1a45a5,1c9793f974db1427ae7374f1ab11cce3abe54bb5..16d6c61b5e83c49086f163a53ba98dc23793865f
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -162,8 -162,8 +162,8 @@@ Clusters
        # Arvados object is created, modified, or deleted.)
        #
        # Currently, websocket event notifications rely on audit logs, so
 -      # this should not be set lower than 600 (5 minutes).
 +      # this should not be set lower than 300 (5 minutes).
-       MaxAge: 1209600
+       MaxAge: 336h
  
        # Maximum number of log rows to delete in a single SQL transaction.
        #

diff --cc lib/config/generated_config.go
index 5339c15a64572ad50fa00e6915c31227a2a2e473,3cbc9041a8b15de4b518e8f9b4cd4b634ff06579..5ee62ee82e7801af4dece12e33a2ab9f76f57f67
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -168,8 -168,8 +168,8 @@@ Clusters
        # Arvados object is created, modified, or deleted.)
        #
        # Currently, websocket event notifications rely on audit logs, so
 -      # this should not be set lower than 600 (5 minutes).
 +      # this should not be set lower than 300 (5 minutes).
-       MaxAge: 1209600
+       MaxAge: 336h
  
        # Maximum number of log rows to delete in a single SQL transaction.
        #