[ARVADOS] updated: 48ccafc46692ae60300039937a15c0ec6f106697

[git at public.curoverse.com]

Summary of changes:
 .../create-standard-objects.html.textile.liquid    | 22 ++-----------
 docker/api/setup.sh.in                             |  9 ------
 docker/api/supervisor.conf                         |  3 ++
 docker/build_tools/Makefile                        |  5 +--
 services/api/app/models/user.rb                    | 37 ++++++----------------
 services/api/db/seeds.rb                           |  1 +
 services/api/lib/current_api_client.rb             | 21 ++++++++++++
 7 files changed, 37 insertions(+), 61 deletions(-)

       via  48ccafc46692ae60300039937a15c0ec6f106697 (commit)
       via  5185c0d7e1d9aa8ea4abe46e4bbc0927e52e9a66 (commit)
       via  5c375252581488d15345f0dbd8aba7dd3cfa6977 (commit)
       via  41f2b53c35ec79498a513cce2e2fd9019e769c70 (commit)
       via  b709c1bdaefdbbb8819cfd497fa557ef2d662a9c (commit)
       via  5662a056ff6e3328966272a4a7852d0d3f572739 (commit)
      from  b77fb69914fda0aedecddf2e62076cb404265647 (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 48ccafc46692ae60300039937a15c0ec6f106697
Merge: b77fb69 5185c0d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 20 10:41:00 2014 -0500

    Merge branch '3824-docker-fixes' refs #3824 refs #4186


commit 5185c0d7e1d9aa8ea4abe46e4bbc0927e52e9a66
Merge: 5c37525 b77fb69
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 20 10:38:27 2014 -0500

    3824: Merge branch 'master' into 3824-docker-fixes


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


hooks/post-receive
--