[ARVADOS] updated: 99c4b804af44311d95e0b0ab72521471a1166347

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  2 +-
 apps/workbench/Gemfile.lock                        | 78 +++++++++++-----------
 doc/install/install-api-server.html.textile.liquid | 30 +++++----
 ...l-manual-prerequisites-ruby.html.textile.liquid | 14 ++--
 sdk/python/tests/run_test_server.py                |  9 ++-
 sdk/python/tests/test_arv_put.py                   |  2 +-
 .../app/controllers/user_sessions_controller.rb    |  4 +-
 .../api/app/views/static/login_failure.html.erb    |  2 +-
 services/api/config/application.default.yml        |  9 +++
 services/api/config/application.yml.example        |  3 +
 services/api/config/database.yml.sample            |  3 +
 services/api/config/initializers/load_config.rb    | 16 +++++
 .../api/config/initializers/omniauth.rb.example    | 13 ----
 services/api/config/initializers/omniauth_init.rb  | 19 ++++++
 14 files changed, 122 insertions(+), 82 deletions(-)
 delete mode 100644 services/api/config/initializers/omniauth.rb.example
 create mode 100644 services/api/config/initializers/omniauth_init.rb

       via  99c4b804af44311d95e0b0ab72521471a1166347 (commit)
       via  2ecf7efbab5ceb082739dcffd98c18bb4b14447e (commit)
       via  9fbb2bbd4e2a0f1d15e1db3f3d606cdedae825a7 (commit)
       via  e56ea5c6c9244d2baaef9a24efc5eaad5bdf290c (commit)
       via  71ba12ca158c39c17187f15c26279ec00d461dc5 (commit)
       via  85de04ad9268e45bad459a606bfabfca4f6fad8c (commit)
       via  158b18f036fc5f3f5848390d7ef53c6493aeb5a9 (commit)
       via  acfbb64831047dcae895e57ceff3d0a834c91bf2 (commit)
       via  734a66939892064fe9c663fd746cb7371c7d84e4 (commit)
      from  3cf223a0d4374e6fc743439826f49adaf29f21cb (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 99c4b804af44311d95e0b0ab72521471a1166347
Merge: 3cf223a 2ecf7ef
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 8 14:56:30 2015 -0400

    Merge branch '6377-dev-startup' refs #6377


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


hooks/post-receive
--