Merge branch 'master' of github.com:MISP/misp-objects

objects/course-of-action/definition.json

@@ -53,7 +53,8 @@
       "disable_correlation": true,
       "sane_default": [
         "Remedy",
-        "Response"
+        "Response",
+        "Further Analysis Required"
       ]
     },
     "cost": {

objects/device/definition.json

@@ -26,7 +26,7 @@
       "ui-priority": 99,
       "misp-attribute": "text",
       "disable_correlation": true,
-      "categories": [
+      "sane_default": [
         "PC",
         "Mobile",
         "Laptop",

relationships/definition.json

@@ -1,5 +1,5 @@
 {
-  "version": 14,
+  "version": 15,
   "values": [
     {
       "name": "derived-from",
@@ -10,6 +10,13 @@
         "alfred"
       ]
     },
+    {
+      "name": "executes",
+      "description": "This relationship describes an object which executes another object",
+      "format": [
+        "misp"
+      ]
+    },
     {
       "name": "duplicate-of",
       "description": "The referenced source and target objects are semantically duplicates of each other.",