Skip to content

Commit a37ae4b

Browse files
authored
Merge branch 'enterprise-3.8-release' into enterprise-3.8-backport-528-suppress-secret-scanning-encrypted-secrets-warning
2 parents de91373 + 2d416d9 commit a37ae4b

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

share/github-backup-utils/ghe-backup-config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,10 @@ ghe_parallel_check() {
207207
GHE_PARALLEL_COMMAND="parallel"
208208
local x
209209
for x in \
210+
/usr/bin/parallel-moreutils \
210211
/usr/bin/parallel.moreutils \
211212
/usr/bin/parallel_moreutils \
213+
/usr/bin/moreutils-parallel \
212214
/usr/bin/moreutils.parallel \
213215
/usr/bin/moreutils_parallel \
214216
; do

test/testlib.sh

100644100755
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,10 @@ setup_moreutils_parallel() {
588588
# We need moreutils parallel
589589
local x
590590
for x in \
591+
/usr/bin/parallel-moreutils \
591592
/usr/bin/parallel.moreutils \
592593
/usr/bin/parallel_moreutils \
594+
/usr/bin/moreutils-parallel \
593595
/usr/bin/moreutils.parallel \
594596
/usr/bin/moreutils_parallel \
595597
; do

0 commit comments

Comments
 (0)