Merge branch 'master' of github.com:gencer/cache-buildkite-plugin

nienbo · Dec 26, 2020 · 9a971fb · 9a971fb
2 parents 37cd9a8 + ecc1934
commit 9a971fb
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,14 @@
+<<<<<<< HEAD
 # v2.3.6
 
 + Added checking for `busybox` and fallback to lesser options of `tar`.
 + Use `-exec` with `rm -f` using `find` instead of native `-delete` option.
+=======
+# master
+
++ Skip tar argument `--ignore-failed-read` if `busybox` detected.
++ Drop `-ignore_readdir_race` from `find` favor on `-exec`.
+>>>>>>> ecc1934847d3ddc6a026657bed62031cfec0f822
 
 # v2.3.5