[ARVADOS] updated: f3504dc2b40eaa4235092b671ce0bece43732904

[git at public.curoverse.com]

Summary of changes:
 doc/install/install-api-server.html.textile.liquid | 109 +++--
 services/api/config/application.default.yml        | 486 +++++++++++----------
 services/api/config/application.yml.example        |  31 +-
 .../{database.yml.sample => database.yml.example}  |   0
 .../initializers/hardcoded_api_tokens.rb.example   |   3 -
 5 files changed, 359 insertions(+), 270 deletions(-)
 rename services/api/config/{database.yml.sample => database.yml.example} (100%)
 delete mode 100644 services/api/config/initializers/hardcoded_api_tokens.rb.example

       via  f3504dc2b40eaa4235092b671ce0bece43732904 (commit)
       via  5ef15a740ed578b2c5d3cc4ef28ef38bb1c433af (commit)
       via  415ecc439212c2a670b1df05c3e8b1a90245243e (commit)
       via  157a17462d308d94c68bcdaa4dab055c0e5ccbe8 (commit)
      from  620fb9e0a294f8910ae82c9c38df69976f911c08 (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 f3504dc2b40eaa4235092b671ce0bece43732904
Merge: 620fb9e 5ef15a7
Author: Brett Smith <brett at curoverse.com>
Date:   Sat Aug 1 16:24:54 2015 -0400

    Merge branch '6590-api-config-docs'
    
    I am breaking our own rules here, since this merge includes a
    non-trivial commit from me that hasn't been reviewed.  I'm going ahead
    with it because I understand the driving motivation of branch reviews
    is to make sure two sets of eyes see changes that could impact future
    work, and I think that's been accomplished here.  My changes only
    touch what Peter had already changed.
    
    Plus, with Peter out for a week, the benefits of merging outweigh the
    value of holding back.  Users get the benefit of improved
    documentation immediately; we'll look better at sprint review; and
    documentation mistakes are comparatively easy to fix after the fact.
    
    Closes #6590, #6721.


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


hooks/post-receive
--