projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3036-collection-uuids
[arvados.git]
/
services
/
api
/
test
/
fixtures
/
logs.yml
diff --git
a/services/api/test/fixtures/logs.yml
b/services/api/test/fixtures/logs.yml
index d95177a91aee6d047efa78d3ca1f912d09bc1138..15945cca3b1c0ee6a189e08909b39137f438ea19 100644
(file)
--- a/
services/api/test/fixtures/logs.yml
+++ b/
services/api/test/fixtures/logs.yml
@@
-24,7
+24,7
@@
log4: # foo collection added, readable by active through link
id: 4
uuid: zzzzz-xxxxx-pshmckwoma00004
owner_uuid: zzzzz-tpzed-000000000000000 # system user
id: 4
uuid: zzzzz-xxxxx-pshmckwoma00004
owner_uuid: zzzzz-tpzed-000000000000000 # system user
- object_uuid:
1f4b0bc7583c2a7f9102c395f4ffc5e3+45
# foo file
+ object_uuid:
zzzzz-4zz18-znfnqtbbv4spc3w
# foo file
object_owner_uuid: zzzzz-tpzed-000000000000000 # system user
event_at: <%= 4.minute.ago.to_s(:db) %>
object_owner_uuid: zzzzz-tpzed-000000000000000 # system user
event_at: <%= 4.minute.ago.to_s(:db) %>
@@
-32,6
+32,6
@@
log5: # baz collection added, readable by active and spectator through group 'al
id: 5
uuid: zzzzz-xxxxx-pshmckwoma00005
owner_uuid: zzzzz-tpzed-000000000000000 # system user
id: 5
uuid: zzzzz-xxxxx-pshmckwoma00005
owner_uuid: zzzzz-tpzed-000000000000000 # system user
- object_uuid:
ea10d51bcf88862dbcc36eb292017dfd+45
# baz file
+ object_uuid:
zzzzz-4zz18-y9vne9npefyxh8g
# baz file
object_owner_uuid: zzzzz-tpzed-000000000000000 # system user
event_at: <%= 5.minute.ago.to_s(:db) %>
object_owner_uuid: zzzzz-tpzed-000000000000000 # system user
event_at: <%= 5.minute.ago.to_s(:db) %>