[ARVADOS] updated: 21485541dec5b6df36aaba7d4c2a1e96ba65dec6

git at public.curoverse.com git at public.curoverse.com
Fri May 30 15:02:43 EDT 2014


Summary of changes:
 .../app/controllers/arvados/v1/nodes_controller.rb |  2 +-
 services/api/app/models/arvados_model.rb           | 55 +++++++++++++++++++++-
 services/api/app/models/node.rb                    | 34 ++++++-------
 services/api/app/models/user.rb                    |  8 ++--
 services/api/test/fixtures/links.yml               | 23 +++++++++
 .../functional/arvados/v1/users_controller_test.rb |  2 +
 services/api/test/unit/arvados_model_test.rb       | 44 +++++++++++++++++
 7 files changed, 144 insertions(+), 24 deletions(-)

       via  21485541dec5b6df36aaba7d4c2a1e96ba65dec6 (commit)
       via  8191d7365a61f4d4309c2f0b387188303320a889 (commit)
       via  15cc0bc32eb57c02b566826598c6de2a8587ef9f (commit)
       via  83304d43227dce877cc86d87f8f25463a4fac096 (commit)
       via  6c92a0d8acd0a5525bbe566a3e202b93d498b370 (commit)
       via  4ac438924f1e365cf5231140c9640c004ad4f1ff (commit)
      from  c7ee5e02cae78d3edff6ed393d776c4995441896 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 21485541dec5b6df36aaba7d4c2a1e96ba65dec6
Merge: c7ee5e0 8191d73
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 30 14:55:21 2014 -0400

    2893: Merge branch '2893-no-symbols-in-db' closes #2893


commit 8191d7365a61f4d4309c2f0b387188303320a889
Merge: 15cc0bc c7ee5e0
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 30 14:54:27 2014 -0400

    2893: Merge branch 'master' into 2893-no-symbols-in-db
    
    Conflicts:
    	services/api/test/fixtures/links.yml

diff --cc services/api/test/fixtures/links.yml
index b58f7c6,fe77407..1fb1608
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@@ -404,25 -404,16 +404,39 @@@ multilevel_collection_1_readable_by_act
    head_uuid: 1fd08fc162a5c6413070a8bd0bffc818+150
    properties: {}
  
 +has_symbol_keys_in_database_somehow:
 +  uuid: zzzzz-o0j2j-enl1wg58310loc6
 +  owner_uuid: zzzzz-tpzed-000000000000000
 +  created_at: 2014-05-28 16:24:02.314722162 Z
 +  modified_by_client_uuid: 
 +  modified_by_user_uuid: zzzzz-tpzed-000000000000000
 +  modified_at: 2014-05-28 16:24:02.314484982 Z
 +  tail_uuid: ~
 +  link_class: test
 +  name: ~
 +  head_uuid: ~
 +  properties:
 +    :foo: "bar"
 +    baz:
 +      - waz
 +      - :waz
 +      - :waz
 +      - 1
 +      - ~
 +      - false
 +      - true
 +  updated_at: 2014-05-28 16:24:02.314296411 Z
++
+ bug2931_link_with_null_head_uuid:
+   uuid: zzzzz-o0j2j-uru66qok2wruasb
+   owner_uuid: zzzzz-tpzed-000000000000000
+   created_at: 2014-05-30 14:30:00.184389725 Z
+   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+   modified_by_user_uuid: zzzzz-tpzed-000000000000000
+   modified_at: 2014-05-30 14:30:00.184019565 Z
+   updated_at: 2014-05-30 14:30:00.183829316 Z
+   link_class: permission
+   name: bug2931
+   tail_uuid: ~
+   head_uuid: ~
+   properties: {}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list