Merge branch 'master' into release_2_5

gsmolk · gsmolk · commit c8c74360d497 · 2021-06-17T19:29:07.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -42,11 +42,11 @@ env:
     - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
     - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
 
-jobs:
-    allow_failures:
-        - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
+#jobs:
+#    allow_failures:
+#        - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
 
 # Only run CI for master branch commits to limit our travis usage
-branches:
-    only:
-    - master
+#branches:
+#    only:
+#    - master
