projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10293-cwl-cr-output
[arvados.git]
/
services
/
api
/
app
/
models
/
virtual_machine.rb
diff --git
a/services/api/app/models/virtual_machine.rb
b/services/api/app/models/virtual_machine.rb
index d2830cfcc2afd22c8e42970c1f75d8500b747a71..094591e6cc388f58c30af72c73de29fb030bd504 100644
(file)
--- a/
services/api/app/models/virtual_machine.rb
+++ b/
services/api/app/models/virtual_machine.rb
@@
-1,5
+1,5
@@
class VirtualMachine < ArvadosModel
class VirtualMachine < ArvadosModel
- include
Assign
Uuid
+ include
Has
Uuid
include KindAndEtag
include CommonApiTemplate
include KindAndEtag
include CommonApiTemplate