[ARVADOS] updated: c491bfd795b7c7c4f26f18003290bd7ec9e88d60

[git at public.curoverse.com]

Summary of changes:
 docker/api/Dockerfile                                  |  3 ++-
 docker/api/application.yml.in                          |  2 ++
 docker/build_tools/build.rb                            |  1 +
 docker/config.yml.example                              |  5 +++++
 docker/passenger/Dockerfile                            |  6 ++++--
 services/api/app/controllers/static_controller.rb      | 17 +++++++++++------
 services/api/app/mailers/admin_notifier.rb             | 12 ------------
 services/api/app/mailers/user_notifier.rb              | 12 ------------
 .../views/admin_notifier/new_inactive_user.text.erb    |  4 ++--
 .../api/app/views/admin_notifier/new_user.text.erb     |  4 ++--
 .../app/views/user_notifier/account_is_setup.text.erb  |  4 ++--
 services/api/config/application.default.yml            | 18 ++++++------------
 services/api/config/application.yml.example            |  2 ++
 13 files changed, 39 insertions(+), 51 deletions(-)

       via  c491bfd795b7c7c4f26f18003290bd7ec9e88d60 (commit)
       via  abc1db31bae1b33ed899a1da4b59f2edc0f5f189 (commit)
       via  a805395a2a64aa83a1604ade6932151a0846b577 (commit)
       via  48d04722a5e0478e22be33f58036806a55b3a0eb (commit)
       via  94b11dfc98ed84d0f91f2bc2fc81e76b4d3c35d7 (commit)
       via  e9622f371ad4d75f0a0b5ee9480fae779dd63156 (commit)
       via  5253b7d81a54c6087b35148499c360c692fac870 (commit)
       via  a452ab111d29f4f06d31c3fe760bb17b211020a6 (commit)
      from  c2e491ff35fe12d895587a6e7cf0cc9f1f7bfcd9 (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 c491bfd795b7c7c4f26f18003290bd7ec9e88d60
Merge: c2e491f abc1db3
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Sep 26 01:46:50 2014 -0400

    Merge branch '3991-docker-workbench-address' closes #3991


commit abc1db31bae1b33ed899a1da4b59f2edc0f5f189
Merge: a805395 c2e491f
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Sep 25 21:55:17 2014 -0400

    3991: Merge branch 'master' into 3991-docker-workbench-address


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


hooks/post-receive
--