[ARVADOS] updated: b39d4108e3a78f3bfebc4cf934bfc202eb1f2cf0

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/arvados_base.rb     | 12 +++++++-----
 apps/workbench/test/unit/arvados_base_test.rb |  8 +++++++-
 services/api/app/models/collection.rb         |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

       via  b39d4108e3a78f3bfebc4cf934bfc202eb1f2cf0 (commit)
       via  85bdb48b0262622917abb76bc418667333842545 (commit)
       via  7cd190acfc0b6ce7f65b3effa1e2ce75ed692a3d (commit)
       via  0d540b1fde91b85db18fa027de65bb67c5389477 (commit)
      from  fb049c7f6263217e3f6f4cd2b3c9f6bd0e4af490 (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 b39d4108e3a78f3bfebc4cf934bfc202eb1f2cf0
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 4 12:51:26 2015 -0400

    6203: Corrected one dumb switched order of if conditions that caused 5s lag!!

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 4f274dc..422a7ed 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -103,7 +103,7 @@ class Collection < ArvadosModel
 
       # Remove any permission signatures from the manifest.
       self[:manifest_text] = self.class.munge_manifest_locators!(self[:manifest_text]) do |match|
-        if not in_old_manifest[match[1]] && !cleared_replication_confirmed
+        if not cleared_replication_confirmed  and not in_old_manifest[match[1]]
           self.replication_confirmed_at = nil
           self.replication_confirmed = nil
           cleared_replication_confirmed = true

commit 85bdb48b0262622917abb76bc418667333842545
Merge: fb049c7 7cd190a
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 4 12:16:55 2015 -0400

    Merge branch 'master' into 6203-collection-perf-api


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


hooks/post-receive
--