Merge remote-tracking branch 'origin/master' into release/2.2.1

Author: robkooper

CHANGELOG.md

@@ -4,12 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## 2.2.1 - 2019-09-27
+## 2.2.2 - 2019-09-27
 
 ### Changed
 - Heartbeat is now every five minutes, was every 5 seconds
 - the python3 images were actually python2 images
 
+## 2.2.1 - 2019-08-02
+
+### Changed
+- sample extractors had bad extractor_info.json. registry needs to be an array.
+
 ## 2.2.0 - 2019-04-03
 
 ### Fixed

sample-extractors/echo/extractor_info.json

@@ -10,10 +10,12 @@
       "rabbitmq": "http://clowder.ncsa.illinois.edu/metadata/ncsa.echo#rabbitmq"
     }
   ],
-  "repository": {
-    "repType": "git",
-    "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
-  },
+  "repository": [
+    {
+      "repType": "git",
+      "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
+    }
+  ],
   "process": {
     "file": [
       "*"

sample-extractors/wordcount-simple-extractor/extractor_info.json

@@ -12,10 +12,12 @@
       "characters": "http://clowder.ncsa.illinois.edu/metadata/ncsa.wordcount#characters"
     }
   ],
-  "repository": {
-    "repType": "git",
-    "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
-  },
+  "repository": [
+    {
+      "repType": "git",
+      "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
+    }
+  ],
   "process": {
     "file": [
       "text/*",

sample-extractors/wordcount-simple-r-extractor/extractor_info.json

@@ -12,10 +12,12 @@
       "characters": "http://clowder.ncsa.illinois.edu/metadata/ncsa.wordcount#characters"
     }
   ],
-  "repository": {
-    "repType": "git",
-    "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
-  },
+  "repository": [
+    {
+      "repType": "git",
+      "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
+    }
+  ],
   "process": {
     "file": [
       "text/*",

sample-extractors/wordcount/extractor_info.json

@@ -12,10 +12,12 @@
       "characters": "http://clowder.ncsa.illinois.edu/metadata/ncsa.wordcount#characters"
     }
   ],
-  "repository": {
-    "repType": "git",
-    "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
-  },
+  "repository": [
+    {
+      "repType": "git",
+      "repUrl": "https://opensource.ncsa.illinois.edu/stash/scm/cats/pyclowder.git"
+    }
+  ],
   "process": {
     "file": [
       "text/*",