void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bad merge

Browse source
This commit is contained in:
Joseph Henry 2023-05-01 14:21:45 -07:00
parent 6425f974fa
commit 81b13772b9
No known key found for this signature in database
GPG key ID: C45B33FF5EBC9344
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/validate-1m-linux.sh vendored
View file

@ -119,10 +119,7 @@ time_zt_node2_start=`date +%s`
for ((s=0; s<=MAX_WAIT_SECS; s++)) for ((s=0; s<=MAX_WAIT_SECS; s++))
do do
<<<<<<< HEAD
echo "Checking for online status: $s" echo "Checking for online status: $s"
=======
>>>>>>> dev
node1_online="$($ZT1 -j info | jq '.online' 2>/dev/null)" node1_online="$($ZT1 -j info | jq '.online' 2>/dev/null)"
node2_online="$($ZT2 -j info | jq '.online' 2>/dev/null)" node2_online="$($ZT2 -j info | jq '.online' 2>/dev/null)"
if [[ "$node1_online" == "true" ]] if [[ "$node1_online" == "true" ]]
@ -144,11 +141,8 @@ done
if [[ "$both_instances_online" != "true" ]] if [[ "$both_instances_online" != "true" ]]
then then
echo "One or more instances of ZeroTier failed to come online. Aborting test." >&2 echo "One or more instances of ZeroTier failed to come online. Aborting test." >&2
<<<<<<< HEAD
$ZT1 -j info $ZT1 -j info
$ZT2 -j info $ZT2 -j info
=======
>>>>>>> dev
exit 1 exit 1
fi fi