Merge remote-tracking branch 'origin/candidate-9.0.x' into candidate-…

…9.2.x

.github/workflows/build-and-publish.yml

@@ -59,31 +59,3 @@ jobs:
         github_actor: ${{ secrets.LNB_ACTOR }}
         github_token: ${{ secrets.LNB_TOKEN }}
 
-  ln-builds:
-    needs: build
-    runs-on: ubuntu-20.04
-    if: github.repository == 'hpcc-systems/HPCC-Platform'
-    steps:
-    - name: Free additional disk space (remove Android SDK + Tools)
-      run: |
-        sudo rm -rf /usr/local/lib/android
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Build
-      uses: ./dockerfiles
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        ln_username: ${{ secrets.JFROG_USERNAME }}
-        ln_password: ${{ secrets.JFROG_PASSWORD }}
-        ln_registry: ${{ secrets.JFROG_REGISTRY }}
-        ln_docker_repo: ${{ secrets.JFROG_REPOSITORY }}
-        lnb_token: ${{ secrets.LNB_TOKEN }}
-        latest: 1   # this should only be set on the current minor branch
-        build_ln: 1
-        github_actor: ${{ secrets.LNB_ACTOR }}
-        github_token: ${{ secrets.LNB_TOKEN }}
-        sign_modules: 1
-        signing_secret: ${{ secrets.SIGNING_SECRET }}
-        signing_keyid: ${{ secrets.SIGNING_KEYID }}
-        signing_passphrase: ${{ secrets.SIGNING_PASSPHRASE }}

thorlcr/master/mawatchdog.hpp

@@ -31,7 +31,7 @@ class CMasterWatchdogBase : public CSimpleInterface, implements IThreaded
     PointerArray state;
     SocketEndpoint master;
     Mutex mutex;
-    int retrycount;
+    int retrycount = 0;
     CThreaded threaded;
 protected:
     bool stopped;