projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
13164: Lock tables in order when locking a container.
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index ad2406ae45a7be049c8122920204ab90542b9f67..b0c09840d790db1d634139bd796691d82f2b7c8c 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-81,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