Merge remote-tracking branch 'upstream/master' into zope4py2

software/ors-amarisoft/buildout.hash.cfg

@@ -104,7 +104,7 @@ md5sum = 40cf5389fd91845f4426ef159fb20fc0
 
 [baseband-latency-promise]
 _update_hash_filename_ = promise/check_baseband_latency.py
-md5sum = 983b179735527f6b38393d28bd858400
+md5sum = 4f115e2d9bde9f268c77264dc0deb2a3
 
 [amarisoft-stats-log-promise]
 _update_hash_filename_ = promise/check_amarisoft_stats_log.py

software/ors-amarisoft/promise/check_baseband_latency.py

@@ -66,6 +66,9 @@ class RunPromise(GenericPromise):
   def sense(self):
 
     testing = self.getConfig('testing') == "True"
+    if testing:
+        self.logger.info("skipping promise")
+        return
     amarisoft_stats_log = self.getConfig('amarisoft-stats-log')
     stats_period = int(self.getConfig('stats-period'))
     min_txrx_delay = float(self.getConfig('min-txrx-delay', 5))

software/repman/instance-repman-slave-input-schema.json

@@ -17,7 +17,6 @@
         "latin5",
         "latin7",
         "ascii",
-        "latin5",
         "utf8",
         "utf8mb4",
         "utf16",
@@ -26,7 +25,6 @@
         "binary",
         "utf8_general_ci",
         "utf8_unicode_ci",
-        "utf8_unicode_ci",
         "utf8mb4_bin",
         "utf8mb4_general_ci",
         "utf8mb4_unicode_ci",