[ARVADOS] updated: e73222a8d0c18b159ae3d8b53b54474650bdda16

[git at public.curoverse.com]

Summary of changes:
 docker/api/Dockerfile                              |  4 +-
 docker/api/apache2_vhost.in                        |  2 -
 docker/api/application.yml.in                      | 11 +---
 docker/api/arvados-clients.yml.in                  |  2 +-
 .../{keep_server_1.json => keep_server_0.json.in}  |  3 +-
 .../{keep_server_0.json => keep_server_1.json.in}  |  2 +-
 docker/api/omniauth.rb.in                          |  2 +-
 docker/api/setup-gitolite.sh.in                    |  4 +-
 docker/arvdock                                     | 58 ++++++++++++++++------
 docker/build_tools/Makefile                        | 11 +++-
 docker/build_tools/build.rb                        | 52 +++++++++----------
 docker/config.yml.example                          | 12 +----
 docker/doc/Dockerfile                              |  5 +-
 docker/doc/{apache2_vhost => apache2_vhost.in}     |  5 +-
 docker/sso/apache2_vhost.in                        |  2 -
 docker/workbench/Dockerfile                        |  4 +-
 docker/workbench/apache2_vhost.in                  | 13 ++++-
 docker/workbench/application.yml.in                |  6 ++-
 services/api/db/structure.sql                      |  2 +
 19 files changed, 114 insertions(+), 86 deletions(-)
 rename docker/api/{keep_server_1.json => keep_server_0.json.in} (59%)
 rename docker/api/{keep_server_0.json => keep_server_1.json.in} (59%)
 rename docker/doc/{apache2_vhost => apache2_vhost.in} (62%)

       via  e73222a8d0c18b159ae3d8b53b54474650bdda16 (commit)
       via  a7d558d6c2db242a6555c7f397cb4d91618aa13c (commit)
       via  ae3bb0033a24a38489c49ffc26e5a5e8fd93c160 (commit)
      from  d9214af111bb44deed1246ec97624b6bd8d970c5 (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 e73222a8d0c18b159ae3d8b53b54474650bdda16
Merge: d9214af a7d558d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 27 14:23:03 2015 -0400

    Merge branch '6090-docker-use-local-sso' closes #6138


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


hooks/post-receive
--