Merge tag 'v6.22.1' into igor_6.22

.github/workflows/sanity_check.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Download clang-format-diff.py
       uses: wei/wget@v1
       with:
-        args: https://raw.githubusercontent.com/llvm-mirror/clang/master/tools/clang-format/clang-format-diff.py
+        args: https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format-diff.py
 
     - name: Check format
       run: VERBOSE_CHECK=1 make check-format

.gitignore

@@ -8,6 +8,7 @@ rocksdb.pc
 *.gcda
 *.gcno
 *.o
+*.o.tmp
 *.so
 *.so.*
 *_test
@@ -93,3 +94,8 @@ compile_commands.json
 .clangd
 clang-format-diff.py
 .py3/
+
+fuzz/proto/gen/
+fuzz/crash-*
+
+cmake-build-*

.travis.yml

@@ -3,21 +3,21 @@ dist: trusty
 language: cpp
 os:
   - linux
-  - osx
 arch:
-  - amd64
   - arm64
   - ppc64le
 compiler:
   - gcc
-osx_image: xcode9.4
 cache:
   directories:
   - "$BUILD_DIR/aws"
 addons:
-   apt:
-      packages:
-      - zlib1g-dev
+  apt:
+    update: true
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libgflags-dev
       - libbz2-dev
       - libsnappy-dev
       - curl