[ARVADOS] updated: 19891e472215cf9e976158beb56ba22b8d581d7b

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/projects_controller.rb         |   2 +-
 apps/workbench/app/controllers/users_controller.rb |   3 -
 apps/workbench/app/views/layouts/body.html.erb     |   4 +-
 .../app/views/users/_setup_popup.html.erb          |   7 +-
 .../workbench/app/views/users/_show_admin.html.erb |   8 +-
 apps/workbench/config/application.default.yml      |   3 +
 .../test/controllers/projects_controller_test.rb   |  26 +++
 apps/workbench/test/integration/users_test.rb      |  15 +-
 doc/_includes/_install_debian_key.liquid           |   4 +
 doc/_includes/_install_redhat_key.liquid           |   6 +
 doc/_includes/_note_python27_sc.liquid             |   5 +
 doc/install/install-api-server.html.textile.liquid | 255 +++++++++++++--------
 .../install-arv-git-httpd.html.textile.liquid      |  20 +-
 .../install-compute-node.html.textile.liquid       |  44 ++--
 .../install-crunch-dispatch.html.textile.liquid    |  34 +--
 doc/install/install-keepproxy.html.textile.liquid  |  18 +-
 doc/install/install-keepstore.html.textile.liquid  |  19 +-
 ...l-manual-prerequisites-ruby.html.textile.liquid |   6 +-
 ...nstall-manual-prerequisites.html.textile.liquid |  52 ++++-
 .../install-shell-server.html.textile.liquid       |  38 ++-
 .../install-workbench-app.html.textile.liquid      | 165 ++++++++-----
 doc/sdk/perl/index.html.textile.liquid             |  40 +++-
 doc/sdk/python/sdk-python.html.textile.liquid      |  61 +++--
 .../tutorial-keep-mount.html.textile.liquid        |   2 +-
 sdk/pam/arvados_pam.py                             |  22 +-
 services/api/Rakefile                              |  31 +++
 .../arvados/v1/repositories_controller.rb          |  19 +-
 services/api/app/mailers/user_notifier.rb          |   2 +-
 .../views/user_notifier/account_is_setup.text.erb  |   7 +-
 services/api/db/structure.sql                      |   2 +-
 .../arvados/v1/repositories_controller_test.rb     |  11 +
 .../functional/arvados/v1/users_controller_test.rb |   8 +-
 services/api/test/unit/user_notifier_test.rb       |   8 +-
 33 files changed, 619 insertions(+), 328 deletions(-)
 create mode 100644 doc/_includes/_install_debian_key.liquid
 create mode 100644 doc/_includes/_install_redhat_key.liquid
 create mode 100644 doc/_includes/_note_python27_sc.liquid

       via  19891e472215cf9e976158beb56ba22b8d581d7b (commit)
       via  3d3f25043f3f270a675391237a2a2a73495e1e37 (commit)
       via  76e03aef476139403bab1df2ed038761159ceff1 (commit)
       via  5608a875c36101c791e35c474abf5e3900aad071 (commit)
       via  e06ea339d3d0c0f6fad81128b3cab34cdd4bd36f (commit)
       via  da80f4a198e734313a7991466244083dabd64b00 (commit)
       via  c428f31ab63f8414973848455ab7c44ed4a1d51b (commit)
       via  fdb63be9fde8ea69e78e68f77bb0ab00a79a8d6f (commit)
       via  c0082c57cb7c5e67115e7b03c8c85f74b5b29d0d (commit)
       via  770927dbfa1fb16b3075d1581dc66f4e7a623631 (commit)
       via  fa92bc75955f1a81652241addf3c6b24c594b55e (commit)
       via  80a9fa664c8370436a0190f483410e5af05e26c3 (commit)
       via  f721928e89bb06f6df21432da521c9163ff722e3 (commit)
       via  57922375aa60a80e5af5c1e5baa0205df9dfdfb1 (commit)
       via  09fcf10ff841e5032145936385b406412674a368 (commit)
       via  160aa31a20a754b165f0184d712fba8b65519125 (commit)
       via  0db099d96a60ffafdaf0cdf14e92a4dc579e723e (commit)
       via  cf8786f78aa3d8af225f1eaf2bd7c0a17cfa33fc (commit)
       via  87e9c0e26ff55582a993a8e11902e8657647f59a (commit)
       via  76e74a7feb2142ff48a1189957626cc8f6deb360 (commit)
       via  0ebc3631838c34c0307fe73beb8e8037b0110bcf (commit)
       via  34ec4990bb0deaa6c7bef5b9793da3c6836b79e2 (commit)
      from  45c2b55b04626ab62d725f280893e270502e6011 (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 19891e472215cf9e976158beb56ba22b8d581d7b
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Jul 8 13:58:41 2015 -0400

    Whitespace fixes
    
    refs #6384

diff --git a/sdk/pam/arvados_pam.py b/sdk/pam/arvados_pam.py
index 9fe1657..af87e2c 100644
--- a/sdk/pam/arvados_pam.py
+++ b/sdk/pam/arvados_pam.py
@@ -16,24 +16,24 @@ def check_arvados_token(requested_username, token):
     auth_log("%s %s" % (requested_username, token))
 
     try:
- 	f=file('/etc/default/arvados_pam')
-	config=dict([l for l in f.readlines() if not l.startswith('#') or l.strip()==""])
-	arvados_api_host=config['ARVADOS_API_HOST'].strip()
-	hostname=config['HOSTNAME'].strip()
+        f=file('/etc/default/arvados_pam')
+        config=dict([l for l in f.readlines() if not l.startswith('#') or l.strip()==""])
+        arvados_api_host=config['ARVADOS_API_HOST'].strip()
+        hostname=config['HOSTNAME'].strip()
     except Exception as e:
-	auth_log("problem getting default values" % (str(e)))
+        auth_log("problem getting default values" % (str(e)))
 
     try:
-	arv = arvados.api('v1',host=arvados_api_host, token=token, cache=None)
+        arv = arvados.api('v1',host=arvados_api_host, token=token, cache=None)
     except Exception as e:
-	auth_log(str(e))
-	return False
+        auth_log(str(e))
+        return False
 
     try:
-	matches = arv.virtual_machines().list(filters=[['hostname','=',hostname]]).execute()['items']
+        matches = arv.virtual_machines().list(filters=[['hostname','=',hostname]]).execute()['items']
     except Exception as e:
-	auth_log(str(e))
-	return False
+        auth_log(str(e))
+        return False
 
 
     if len(matches) != 1:

commit 3d3f25043f3f270a675391237a2a2a73495e1e37
Merge: 45c2b55 76e03ae
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Jul 8 13:57:17 2015 -0400

    Merge branch 'master' into 6384-libpam-arvados


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


hooks/post-receive
--