[ARVADOS] updated: f180576ff3ec675e5ad27856a83773166ac6a5ca

[git at public.curoverse.com]

Summary of changes:
 .../api/app/controllers/database_controller.rb     | 55 +++++++++++++---------
 services/keepproxy/keepproxy.go                    |  1 -
 services/keepproxy/keepproxy_test.go               |  2 +
 3 files changed, 35 insertions(+), 23 deletions(-)

       via  f180576ff3ec675e5ad27856a83773166ac6a5ca (commit)
       via  3147edd07223f5ecac0c12d4ec34cc4c4cb7d657 (commit)
       via  1ab570c97f6124ec4249f03c58cbb586f147e11f (commit)
      from  15277a3441d22e42b8291c64360d62e1e8355921 (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 f180576ff3ec675e5ad27856a83773166ac6a5ca
Merge: 15277a3 3147edd
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 8 13:49:27 2014 -0500

    3781: Merge branch 'master' into 3781-browser-upload


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


hooks/post-receive
--