[ARVADOS] updated: 5794ce4f00cd583eee74719118516c0c993fca1c

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/.gitignore                                 |  1 +
 sdk/cli/Gemfile.lock                               | 72 ----------------------
 .../api/app/controllers/database_controller.rb     |  2 +-
 3 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 sdk/cli/Gemfile.lock

       via  5794ce4f00cd583eee74719118516c0c993fca1c (commit)
       via  a03a821d171ff8d6278272a7f6f0a935dca1fa8b (commit)
       via  d225b8be60d1ba15ab584cd5104a4603d2139c72 (commit)
      from  4211e34c99a068e8beb0baa6522c655c35b47b20 (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 5794ce4f00cd583eee74719118516c0c993fca1c
Merge: a03a821 d225b8b
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Dec 5 13:25:12 2014 -0500

    Merge branch '4156-no-gemfile-lock-for-gem' refs #4156


commit a03a821d171ff8d6278272a7f6f0a935dca1fa8b
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Dec 5 13:24:49 2014 -0500

    4533: Lock all tables, not just the ones with fixtures. refs #4533

diff --git a/services/api/app/controllers/database_controller.rb b/services/api/app/controllers/database_controller.rb
index 8314514..1e577ae 100644
--- a/services/api/app/controllers/database_controller.rb
+++ b/services/api/app/controllers/database_controller.rb
@@ -32,7 +32,7 @@ class DatabaseController < ApplicationController
     ActiveRecord::Base.transaction do
       # Avoid deadlock by locking all tables before doing anything
       # drastic.
-      table_names = '"' + fixturesets.sort.join('","') + '"'
+      table_names = '"' + ActiveRecord::Base.connection.tables.join('","') + '"'
       ActiveRecord::Base.connection.execute \
       "LOCK TABLE #{table_names} IN ACCESS EXCLUSIVE MODE"
 

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


hooks/post-receive
--