Merge pull request #603 from CSCfi/stable

Merge stable to master: v1.7.1
CSCfi · Jun 23, 2020 · 309a372 · 309a372
2 parents 6dabf42 + b381f0c
commit 309a372
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/metax_api/api/rest/base/api_schemas/catalogrecord.json b/src/metax_api/api/rest/base/api_schemas/catalogrecord.json
@@ -327,7 +327,7 @@
                     "description":"Catalog record deprecation state.",
                     "type":"string",
                     "readonly": true
-                },
+                }
             }
         },
         "CatalogRecordVersionCreatedInfo":{
@@ -359,7 +359,7 @@
                     "readonly": true,
                     "enum":[
                         "dataset",
-                        "pas",
+                        "pas"
                     ]
                 }
             },

diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
@@ -1841,13 +1841,13 @@ parameters:
 
 definitions:
   CatalogRecord:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/catalogrecord.json#/definitions/CatalogRecord'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/catalogrecord.json#/definitions/CatalogRecord'
   DataCatalog:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/datacatalog.json#/definitions/Catalog'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/datacatalog.json#/definitions/Catalog'
   File:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/file.json#/definitions/File'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/file.json#/definitions/File'
   Directory:
-    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/file.json#/definitions/Directory'
+    $ref: 'https://__METAX_ENV_DOMAIN__/apischemas/v1/file.json#/definitions/Directory'
   StringList:
     type: array
     items: