Merge remote-tracking branch 'origin/master' into merge

pcd1193182 · Nov 12, 2021 · ab2bba7 · ab2bba7
2 parents 38f1574 + ccef081
commit ab2bba7
Show file tree

Hide file tree

Showing 79 changed files with 2,147 additions and 610 deletions.
diff --git a/.github/workflows/zfs-tests-object-store.yml b/.github/workflows/zfs-tests-object-store.yml
@@ -69,6 +69,8 @@ jobs:
         ZTS_BUCKET_NAME: testbucket
         ZTS_OBJECT_ENDPOINT: http://127.0.0.1:9000
         ZTS_REGION: us-west-2
+        AWS_ACCESS_KEY_ID: minioadmin
+        AWS_SECRET_ACCESS_KEY: minioadmin
     - name: Prepare artifacts
       if: failure()
       run: |