Skip to content

Commit

Permalink
Merge pull request #1370 from Yvand/yvand/suppress-reboot-joinedfarm
Browse files Browse the repository at this point in the history
SPFarm: Suppress useless reboot triggered once a server joined the farm
  • Loading branch information
ykuijs committed Jan 7, 2022
2 parents 6de4792 + 007e666 commit db71484
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- SPFarm
- Suppress a useless reboot that was triggered once a server joined the farm

## [5.0.0] - 2021-12-17

### Added
Expand Down
5 changes: 1 addition & 4 deletions SharePointDsc/DSCResources/MSFT_SPFarm/MSFT_SPFarm.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -1239,10 +1239,7 @@ function Set-TargetResource
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")
}
}
}
Expand Down

0 comments on commit db71484

Please sign in to comment.