[ARVADOS] updated: a9dcceaa2d3dcc3ff8984ac013022fda5a1a31e9

[git at public.curoverse.com]

Summary of changes:
 .../api/app/controllers/arvados/v1/virtual_machines_controller.rb    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  a9dcceaa2d3dcc3ff8984ac013022fda5a1a31e9 (commit)
      from  3bd42c764e0d208e1ff0f1dc78de43cf0bdde335 (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 a9dcceaa2d3dcc3ff8984ac013022fda5a1a31e9
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Jun 17 13:29:23 2015 -0400

    6320: Fixup username handling in API virtual machine logins method.

diff --git a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
index 67e23cd..519178b 100644
--- a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
+++ b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
@@ -24,10 +24,9 @@ class Arvados::V1::VirtualMachinesController < ApplicationController
       vm.login_permissions.each do |perm|
         user_uuid = perm.tail_uuid
         @users[user_uuid].andand.authorized_keys.andand.each do |ak|
-          username = perm.properties.andand['username']
-          if username
+          unless perm.properties['username'].blank?
             @response << {
-              username: username,
+              username: perm.properties['username'],
               hostname: vm.hostname,
               groups: (perm.properties["groups"].to_a rescue []),
               public_key: ak.public_key,

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


hooks/post-receive
--