From: Tom Clegg <tom@curoverse.com>
Date: Thu, 15 May 2014 18:19:06 +0000 (-0400)
Subject: 2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809
X-Git-Tag: 1.1.0~2607^2~13^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/03395937ba05b9e3192e346a355c691f45cc7c85

2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809

Conflicts:
	apps/workbench/app/models/arvados_api_client.rb
---

03395937ba05b9e3192e346a355c691f45cc7c85
diff --cc apps/workbench/app/models/arvados_api_client.rb
index dc1b6ede01,c6d8720c92..25e776a942
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@@ -67,12 -57,10 +67,12 @@@ class ArvadosApiClien
  
      header = {"Accept" => "application/json"}
  
-     profile_checkpoint { "Prepare request #{url} #{query[:uuid]} #{query[:where]}" }
+     profile_checkpoint { "Prepare request #{url} #{query[:uuid]} #{query[:where]} #{query[:filters]}" }
 -    msg = @@api_client.post(url,
 -                            query,
 -                            header: header)
 +    msg = @client_mtx.synchronize do
 +      @api_client.post(url,
 +                       query,
 +                       header: header)
 +    end
      profile_checkpoint 'API transaction'
  
      if msg.status_code == 401