[ARVADOS] updated: 1f7a6b50cabab4c8645dd6db92e456c080f2a81c

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/collection.rb                               | 4 ++--
 services/api/config/application.default.yml                         | 4 ++--
 .../api/db/migrate/20150206230342_rename_replication_attributes.rb  | 2 +-
 services/api/test/fixtures/collections.yml                          | 6 +++---
 services/api/test/unit/collection_test.rb                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

       via  1f7a6b50cabab4c8645dd6db92e456c080f2a81c (commit)
       via  08c575dc24bbc5732a5fcb1126c23d9a4ca10b73 (commit)
      from  d302307a4a66867419722034228823d1fc3910a6 (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 1f7a6b50cabab4c8645dd6db92e456c080f2a81c
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Feb 14 20:20:37 2015 -0500

    3410: Update comments.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index f40508e..1e8d79f 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -246,6 +246,6 @@ common:
   # server is using a self-signed cert.
   sso_insecure: false
 
-  # Set replication level for collections whose replication_desired
-  # attribute is nil.
+  # Default replication level for collections. This is used when a
+  # collection's replication_desired attribute is nil.
   default_collection_replication: 2
diff --git a/services/api/db/migrate/20150206230342_rename_replication_attributes.rb b/services/api/db/migrate/20150206230342_rename_replication_attributes.rb
index e1519a3..23f0ffc 100644
--- a/services/api/db/migrate/20150206230342_rename_replication_attributes.rb
+++ b/services/api/db/migrate/20150206230342_rename_replication_attributes.rb
@@ -10,7 +10,7 @@ class RenameReplicationAttributes < ActiveRecord::Migration
     remove_column :collections, :redundancy_confirmed_by_client_uuid
     Collection.reset_column_information
 
-    # Removing that column dropped some indexes. Let's put them back.
+    # Removing that column dropped some search indexes. Let's put them back.
     add_index :collections, ["owner_uuid", "modified_by_client_uuid", "modified_by_user_uuid", "portable_data_hash", "uuid", "name", "file_names"], name: 'collections_search_index'
     execute "CREATE INDEX collections_full_text_search_idx ON collections USING gin(#{Collection.full_text_tsvector});"
   end
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 3f848f6..c14650c 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -403,7 +403,7 @@ replication_undesired_unconfirmed:
   updated_at: 2015-02-07 00:19:28.596236608 Z
   uuid: zzzzz-4zz18-wjxq7uzx2m9jj4a
   manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
-  name: replication wantnull havenull
+  name: replication want=null have=null
 
 replication_desired_2_unconfirmed:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
@@ -417,7 +417,7 @@ replication_desired_2_unconfirmed:
   updated_at: 2015-02-07 00:21:35.050126576 Z
   uuid: zzzzz-4zz18-3t236wrz4769h7x
   manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
-  name: replication want2 havenull
+  name: replication want=2 have=null
 
 replication_desired_2_confirmed_2:
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
@@ -431,7 +431,7 @@ replication_desired_2_confirmed_2:
   updated_at: 2015-02-07 00:24:52.983381227 Z
   uuid: zzzzz-4zz18-434zv1tnnf2rygp
   manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 3:6:bar\n"
-  name: replication want2 have2
+  name: replication want=2 have=2
 
 # Test Helper trims the rest of the file
 
diff --git a/services/api/test/unit/collection_test.rb b/services/api/test/unit/collection_test.rb
index 6a3225e..f158cfe 100644
--- a/services/api/test/unit/collection_test.rb
+++ b/services/api/test/unit/collection_test.rb
@@ -163,7 +163,7 @@ class CollectionTest < ActiveSupport::TestCase
       assert_raise ArvadosModel::PermissionDeniedError do
         c.update_attributes replication_confirmed_at: Time.now
       end
-      # Cannot set both at once.
+      # Cannot set both at once, either.
       assert_raise ArvadosModel::PermissionDeniedError do
         c.update_attributes(replication_confirmed: 1,
                             replication_confirmed_at: Time.now)

commit 08c575dc24bbc5732a5fcb1126c23d9a4ca10b73
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Feb 14 19:56:19 2015 -0500

    3410: Rename maybe_clear_redundancy_confirmed to maybe_clear_replication_confirmed.

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 1b07e50..ebe88b4 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -9,7 +9,7 @@ class Collection < ArvadosModel
   before_validation :check_signatures
   before_validation :strip_manifest_text
   before_validation :set_portable_data_hash
-  before_validation :maybe_clear_redundancy_confirmed
+  before_validation :maybe_clear_replication_confirmed
   validate :ensure_hash_matches_manifest_text
   before_save :set_file_names
 
@@ -324,7 +324,7 @@ class Collection < ArvadosModel
      portable_manifest.bytesize.to_s)
   end
 
-  def maybe_clear_redundancy_confirmed
+  def maybe_clear_replication_confirmed
     if manifest_text_changed?
       # If the new manifest_text contains locators whose hashes
       # weren't in the old manifest_text, storage replication is no

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


hooks/post-receive
--