diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a9f455b..ba2c47488 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SPTrustedIdentityTokenIssuer - Added parameters to support OIDC authentication in SharePoint Server Subscription Edition +- SPFarm + - Suppress a useless reboot that was triggered once a server joined the farm + - Suppress a useless 5 minutes sleep triggered once a server joined the farm ## [5.0.0] - 2021-12-17 diff --git a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 index f36ccc4db..641e9ac35 100644 --- a/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1 @@ -1235,14 +1235,7 @@ function Set-TargetResource { Write-Verbose -Message "Starting timer service" Start-Service -Name sptimerv4 - - Write-Verbose -Message ("Pausing for 5 minutes to allow the timer service to " + - "fully provision the server") - Start-Sleep -Seconds 300 - Write-Verbose -Message ("Join farm complete. Restarting computer to allow " + - "configuration to continue") - - $global:DSCMachineStatus = 1 + Write-Verbose -Message ("Join farm complete") } } }