Merge branch 'master' into 13804-no-shutdown-wanted-nodes

[arvados.git] / services / api / config / routes.rb

diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index fcd5c34212d16187207e64abc8372e43ecd09af8..b0c09840d790db1d634139bd796691d82f2b7c8c 100644 (file)
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -39,6 +39,7 @@ Server::Application.routes.draw do
         get 'auth', on: :member
         post 'lock', on: :member
         post 'unlock', on: :member
+        get 'secret_mounts', on: :member
         get 'current', on: :collection
       end
       resources :container_requests
@@ -80,6 +81,7 @@ Server::Application.routes.draw do
         post 'setup', on: :collection
         post 'unsetup', on: :member
         post 'update_uuid', on: :member
+        post 'merge', on: :collection
       end
       resources :virtual_machines do
         get 'logins', on: :member