[ARVADOS] updated: bdf21a9acf55f9cb1ee349b9df1f38a2100c479e

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |  3 +--
 docker/build_tools/Makefile                        |  6 +++++
 docker/bwa-samtools/Dockerfile                     | 21 +++++++++++++++++
 services/fuse/bin/arv-mount                        | 26 +++++++++++++---------
 4 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 docker/bwa-samtools/Dockerfile

       via  bdf21a9acf55f9cb1ee349b9df1f38a2100c479e (commit)
       via  4cb8dd4c68c09c8a8a403caea87197846abcb413 (commit)
       via  cd5dd98b4b660085586693cdc2cf350fcc06a074 (commit)
       via  71035a6ed21e5acf4604b04bd7e046734efd650b (commit)
      from  fa27f036061670f161e1e681155bcc935da81ef3 (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 bdf21a9acf55f9cb1ee349b9df1f38a2100c479e
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 1 12:58:11 2014 -0400

    3659: minor cleanup

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 68e5506..bd56edc 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -504,13 +504,12 @@ class ApplicationController < ActionController::Base
       if anonymous_user_token != previous_api_token
         Thread.current[:arvados_api_token] = anonymous_user_token
         valid_anonymous_token = verify_api_token
+        Thread.current[:arvados_api_token] = previous_api_token
         if valid_anonymous_token
           Thread.current[:arvados_anonymous_api_token] = anonymous_user_token
         else
           Thread.current[:arvados_anonymous_api_token] = nil
         end
-        Thread.current[:arvados_api_token] = previous_api_token
-        verify_api_token
       else
         Thread.current[:arvados_anonymous_api_token] = anonymous_user_token
       end

commit 4cb8dd4c68c09c8a8a403caea87197846abcb413
Merge: fa27f03 cd5dd98
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 1 11:00:12 2014 -0400

    Merge branch 'master' into 2659-anonymous-group


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


hooks/post-receive
--