From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Mon, 26 Nov 2018 12:09:02 +0000 (+0100)
Subject: Merge branch 'master' into 13864-Virtual-machines
X-Git-Tag: 1.3.0~11^2~3
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/b3ffad71aa43fcb8db2d2c7a20ee0ef588e37e04

Merge branch 'master' into 13864-Virtual-machines

refs #13864

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
---

b3ffad71aa43fcb8db2d2c7a20ee0ef588e37e04
diff --cc src/models/resource.ts
index d2f524fc,5fa61797..679a800a
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -29,8 -29,8 +29,9 @@@ export enum ResourceKind 
      PROCESS = "arvados#containerRequest",
      PROJECT = "arvados#group",
      REPOSITORY = "arvados#repository",
+     SSH_KEY = "arvados#authorizedKeys",
      USER = "arvados#user",
 +    VIRTUAL_MACHINE = "arvados#virtualMachine",
      WORKFLOW = "arvados#workflow",
      NONE = "arvados#none"
  }