projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19320-spot-pricing'
[arvados.git]
/
services
/
api
/
test
/
fixtures
/
collections.yml
diff --git
a/services/api/test/fixtures/collections.yml
b/services/api/test/fixtures/collections.yml
index 767f035b88cb824c47de95ef9571c5531c228c23..a5c3e63dde65ffcd935b016b7f255d6effffbe0e 100644
(file)
--- a/
services/api/test/fixtures/collections.yml
+++ b/
services/api/test/fixtures/collections.yml
@@
-21,10
+21,10
@@
collection_owned_by_active:
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2014-02-03T17:22:54Z
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2014-02-03T17:22:54Z
- modified_by_client_uuid: zzzzz-ozdt8-
brczlopd8u8d0jr
+ modified_by_client_uuid: zzzzz-ozdt8-
teyxzyd8qllg11h
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
- modified_at: 2014-02-03T1
7
:22:54Z
- updated_at: 2014-02-03T1
7
:22:54Z
+ modified_at: 2014-02-03T1
8
:22:54Z
+ updated_at: 2014-02-03T1
8
:22:54Z
manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
name: owned_by_active
version: 2
manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
name: owned_by_active
version: 2
@@
-43,7
+43,7
@@
collection_owned_by_active_with_file_stats:
file_count: 1
file_size_total: 3
name: owned_by_active_with_file_stats
file_count: 1
file_size_total: 3
name: owned_by_active_with_file_stats
- version:
2
+ version:
1
collection_owned_by_active_past_version_1:
uuid: zzzzz-4zz18-znfnqtbbv4spast
collection_owned_by_active_past_version_1:
uuid: zzzzz-4zz18-znfnqtbbv4spast
@@
-53,8
+53,8
@@
collection_owned_by_active_past_version_1:
created_at: 2014-02-03T17:22:54Z
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
created_at: 2014-02-03T17:22:54Z
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
- modified_at: 2014-02-03T1
5
:22:54Z
- updated_at: 2014-02-03T1
5
:22:54Z
+ modified_at: 2014-02-03T1
8
:22:54Z
+ updated_at: 2014-02-03T1
8
:22:54Z
manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
name: owned_by_active_version_1
version: 1
manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
name: owned_by_active_version_1
version: 1
@@
-106,8
+106,8
@@
w_a_z_file:
created_at: 2015-02-09T10:53:38Z
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
created_at: 2015-02-09T10:53:38Z
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
- modified_at: 2015-02-09T10:5
3
:38Z
- updated_at: 2015-02-09T10:5
3
:38Z
+ modified_at: 2015-02-09T10:5
5
:38Z
+ updated_at: 2015-02-09T10:5
5
:38Z
manifest_text: ". 4c6c2c0ac8aa0696edd7316a3be5ca3c+5 0:5:w\\040\\141\\040z\n"
name: "\"w a z\" file"
version: 2
manifest_text: ". 4c6c2c0ac8aa0696edd7316a3be5ca3c+5 0:5:w\\040\\141\\040z\n"
name: "\"w a z\" file"
version: 2
@@
-120,8
+120,8
@@
w_a_z_file_version_1:
created_at: 2015-02-09T10:53:38Z
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
created_at: 2015-02-09T10:53:38Z
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
- modified_at: 2015-02-09T10:5
3
:38Z
- updated_at: 2015-02-09T10:5
3
:38Z
+ modified_at: 2015-02-09T10:5
5
:38Z
+ updated_at: 2015-02-09T10:5
5
:38Z
manifest_text: ". 4d20280d5e516a0109768d49ab0f3318+3 0:3:waz\n"
name: "waz file"
version: 1
manifest_text: ". 4d20280d5e516a0109768d49ab0f3318+3 0:3:waz\n"
name: "waz file"
version: 1
@@
-987,8
+987,8
@@
collection_with_list_prop_odd:
listprop: [elem1, elem3, 5]
collection_with_list_prop_even:
listprop: [elem1, elem3, 5]
collection_with_list_prop_even:
- uuid: zzzzz-4zz18-listpropertyev
e
n
- current_version_uuid: zzzzz-4zz18-listpropertyev
e
n
+ uuid: zzzzz-4zz18-listpropertyevn
+ current_version_uuid: zzzzz-4zz18-listpropertyevn
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2015-02-13T17:22:54Z
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2015-02-13T17:22:54Z
@@
-1002,8
+1002,8
@@
collection_with_list_prop_even:
listprop: [elem2, 4, elem6, ELEM8]
collection_with_listprop_elem1:
listprop: [elem2, 4, elem6, ELEM8]
collection_with_listprop_elem1:
- uuid: zzzzz-4zz18-listpropelem1
- current_version_uuid: zzzzz-4zz18-listpropelem1
+ uuid: zzzzz-4zz18-listpropelem
en
1
+ current_version_uuid: zzzzz-4zz18-listpropelem
en
1
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2015-02-13T17:22:54Z
portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
created_at: 2015-02-13T17:22:54Z