[ARVADOS] updated: 18e24e8b11b92909ddeafe81d3f64ad85f9cb097

[git at public.curoverse.com]

Summary of changes:
 doc/_includes/_ssh_addkey.liquid                   |  6 +---
 docker/base/Dockerfile                             |  2 +-
 sdk/cli/bin/crunch-job                             | 21 ++++++------
 .../api/app/controllers/application_controller.rb  | 13 +++++---
 services/api/config/application.default.yml        | 28 +++++++++-------
 .../arvados/v1/collections_controller_test.rb      | 38 ++++++++++++++++++----
 6 files changed, 70 insertions(+), 38 deletions(-)

       via  18e24e8b11b92909ddeafe81d3f64ad85f9cb097 (commit)
       via  e56061a95228f9c81085cdf30a68c60931cdaf66 (commit)
       via  511daa2d275143d89600f015ee0bb19dcbe5641c (commit)
       via  b33597e94eec5f21fbbcfa72611a3b36397755d5 (commit)
       via  869f3f0ad541c85bfb72060b1018905d3f882292 (commit)
       via  a12cf91db3ececed782d9718af30553f8866ad81 (commit)
       via  602706ef5510b3f07fc5fa988019952d2133320c (commit)
       via  39a1340d56f7acbddb771f6bef36b68ee9076885 (commit)
       via  22c8b6367a9cd79b17240b7dca1ac8f7d8e7ee77 (commit)
       via  de8324b3fbbf3f67f0f61c162f5895e8dcd3142d (commit)
       via  69f592e029493afb8a0709811b5be1fefabafb4b (commit)
      from  5881feb407af2d4e5785ad57232cc3bfd12b86ec (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 18e24e8b11b92909ddeafe81d3f64ad85f9cb097
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 9 10:21:38 2015 -0400

    6093: remove "Alternate way to add SSH keys" and add the "Manage account" link blurb to "Adding your keys" section itself.

diff --git a/doc/_includes/_ssh_addkey.liquid b/doc/_includes/_ssh_addkey.liquid
index e106ed8..6896ce9 100644
--- a/doc/_includes/_ssh_addkey.liquid
+++ b/doc/_includes/_ssh_addkey.liquid
@@ -5,15 +5,11 @@ h1(#workbench). Adding your key to Arvados Workbench
 
 h3. From the Workbench dashboard
 
-If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key.  In the Workbench top navigation menu, look for a dropdown menu with an icon such as <span class="badge badge-alert">1</span> <span class="fa fa-lg fa-user"></span> <span class="caret"></span> (the number indicates there are new notifications).  Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Click on the link *Click here to set up an SSH public key for use with Arvados*. This will take you to the *Manage account* page. Click on the <span class="btn btn-primary">*+* Add new SSH key</span> button in this page. This will open a popup as shown in this screenshot:
+If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key.  In the Workbench top navigation menu, look for a dropdown menu with an icon such as <span class="badge badge-alert">1</span> <span class="fa fa-lg fa-user"></span> <span class="caret"></span> (the number indicates there are new notifications).  Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Click on the link *Click here to set up an SSH public key for use with Arvados*. Alternatively, you can click on the menu item *Manage account*. Either one of these actions will take you to the *Manage account* page. Click on the <span class="btn btn-primary">*+* Add new SSH key</span> button in this page. This will open a popup as shown in this screenshot:
 
 !{{ site.baseurl }}/images/ssh-adding-public-key.png!
 Paste your public key into the text area labeled *Public Key*, and click on the <span class="btn btn-primary">Submit</span> button. You are now ready to "log into an Arvados VM":#login.
 
-h3. Alternate way to add SSH keys
-
-Click on the dropdown menu icon <span class="fa fa-lg fa-user"></span> <span class="caret"></span> in the upper right corner of the top navigation menu to access the user settings menu, and click on the menu item *Manage account* to go to the account management page and follow the instructions in the above section.
-
 h1(#login). Using SSH to log into an Arvados VM
 
 To see a list of virtual machines that you have access to and determine the name and login information, click on the dropdown menu icon <span class="fa fa-lg fa-user"></span> <span class="caret"></span> in the upper right corner of the top navigation menu to access the user settings menu and click on the menu item *Manage account* to go to the account management page. On this page, you will see a *Virtual Machines* panel, which lists the virtual machines you can access. The *hostname* column lists the name of each available VM.  The *logins* column will have a list of comma separated values of the form @you at . In this guide the hostname will be *_shell_* and the login will be *_you_*.  Replace these with your hostname and login name as appropriate.

commit e56061a95228f9c81085cdf30a68c60931cdaf66
Merge: 5881feb 511daa2
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 9 10:09:07 2015 -0400

    Merge branch 'master' into 6093-refresh-docs


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


hooks/post-receive
--