[ARVADOS] updated: cea7dc41b15938bd7d2fb3851b7b7c434fea2ed0

[git at public.curoverse.com]

Summary of changes:
 ...106_fix_collection_portable_data_hash_with_hinted_manifest.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  cea7dc41b15938bd7d2fb3851b7b7c434fea2ed0 (commit)
      from  18cc8023e777c9b577ea8751b9f8b5fc652c505e (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 cea7dc41b15938bd7d2fb3851b7b7c434fea2ed0
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Mar 6 11:36:22 2015 -0500

    5319: Fixup migration UUID generation code.

diff --git a/services/api/db/migrate/20150303210106_fix_collection_portable_data_hash_with_hinted_manifest.rb b/services/api/db/migrate/20150303210106_fix_collection_portable_data_hash_with_hinted_manifest.rb
index e0c9dce..89d54a0 100644
--- a/services/api/db/migrate/20150303210106_fix_collection_portable_data_hash_with_hinted_manifest.rb
+++ b/services/api/db/migrate/20150303210106_fix_collection_portable_data_hash_with_hinted_manifest.rb
@@ -6,13 +6,18 @@ class FixCollectionPortableDataHashWithHintedManifest < ActiveRecord::Migration
 
   class ArvadosModel < ActiveRecord::Base
     self.abstract_class = true
-    include HasUuid::ClassMethods
+    extend HasUuid::ClassMethods
     include KindAndEtag
     before_create do |record|
-      record.uuid ||= generate_uuid
+      record.uuid ||= record.class.generate_uuid
       record.owner_uuid ||= system_user_uuid
     end
     serialize :properties, Hash
+
+    def self.to_s
+      # Clean up the name of the stub model class so we generate correct UUIDs.
+      super.sub("FixCollectionPortableDataHashWithHintedManifest::", "")
+    end
   end
 
   class Collection < ArvadosModel

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


hooks/post-receive
--