[ARVADOS] updated: 6376dc9ef711e339c10e17349eee4c0fc022899c

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/collections_controller.rb      |    4 ++-
 apps/workbench/app/views/collections/show.html.erb |   21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

       via  6376dc9ef711e339c10e17349eee4c0fc022899c (commit)
       via  c4afede392e6128009f24ec6eb7f87ef9f3869cb (commit)
       via  11a238896a160b8dba4e185a369cda1fd4a55609 (commit)
       via  d0f8dba42b3a4c1ca3ae66bb4ad79ec78a1d26d5 (commit)
       via  36c9bf0c6243b987270b80c3764ad4ade49a0cbc (commit)
      from  259d69ccefce787f5d2a4f2828ac4b0135432c87 (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 6376dc9ef711e339c10e17349eee4c0fc022899c
Merge: c4afede 11a2388
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 2 12:52:13 2014 -0800

    Merge branch '1748-workbench-view-files'
    
    closes #1748


commit c4afede392e6128009f24ec6eb7f87ef9f3869cb
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Dec 31 10:48:28 2013 -0800

    Fix error message: print the exit status, not the string "$?".

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index a5fed9d..3cea60b 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -121,7 +121,7 @@ class CollectionsController < ApplicationController
           yield buf
         end
       end
-      Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}: $?") if $? != 0
+      Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}: #{$?}") if $? != 0
     end
   end
 end

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


hooks/post-receive
--