commit 26f5357b5e767be64af5fcc325ae3e2ed0e6902f
author Scott Baker <smbaker@gmail.com> Thu Jun 09 19:26:29 2016 -0700
committer Scott Baker <smbaker@gmail.com> Thu Jun 09 19:26:29 2016 -0700
tree 6cbca6644a34ba966efb7a717b6cfcea8e6f73d8
parent 675fe27c6774827a1cd0d7a511456dd6a63a4853

update custom_types with types from master

xos/tosca/custom_types/xos.m4

diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index d4f771b..4af9050 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -1065,6 +1065,12 @@
     tosca.relationships.TagsObject:
         derived_from: tosca.relationships.Root
 
+    tosca.relationships.MemberOfDevice:
+        derived_from: tosca.relationships.Root

+

+    tosca.relationships.UsesAgent:

+        derived_from: tosca.relationships.Root
+
     tosca.relationships.HasResource:
         derived_from: tosca.relationships.Root
 

xos/tosca/custom_types/xos.yaml

diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 10518d7..aacc2a2 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -1874,6 +1874,12 @@
     tosca.relationships.TagsObject:
         derived_from: tosca.relationships.Root
 
+    tosca.relationships.MemberOfDevice:
+        derived_from: tosca.relationships.Root

+

+    tosca.relationships.UsesAgent:

+        derived_from: tosca.relationships.Root
+
     tosca.relationships.HasResource:
         derived_from: tosca.relationships.Root