Merge remote-tracking branch 'upstream/master'

This commit is contained in:
William Lam
2020-02-06 12:58:58 -08:00

View File

@@ -7010,7 +7010,8 @@ function Start-HVPool {
$updates = @()
$updates += Get-MapEntry -key 'automatedDesktopData.virtualCenterProvisioningSettings.virtualCenterProvisioningData.parentVm' -value $spec.ParentVM
$updates += Get-MapEntry -key 'automatedDesktopData.virtualCenterProvisioningSettings.virtualCenterProvisioningData.snapshot' -value $spec.Snapshot
if (!$confirmFlag -OR $pscmdlet.ShouldProcess($poolList.$item)) {
if ($startTime) { $spec.Settings.startTime = $startTime }
if (!$confirmFlag -OR $pscmdlet.ShouldProcess($poolList.$item)) {
$desktop_helper.Desktop_Update($services,$item,$updates)
}
Write-Host "Performed recompose task on Pool: " $PoolList.$item
@@ -12796,4 +12797,4 @@ Export-ModuleMember -Function Get-HVEventDatabase, Set-HVEventDatabase, Clear-HV
# vCenter Server related
Export-ModuleMember -Function Get-HVvCenterServer, Get-HVvCenterServerHealth
# Misc/other related
Export-ModuleMember -Function Get-HVlicense, Set-HVlicense, Get-HVHealth, Set-HVInstantCloneMaintenance, Get-HVBaseImageVM, Get-HVBaseImageVMSnapshot
Export-ModuleMember -Function Get-HVlicense, Set-HVlicense, Get-HVHealth, Set-HVInstantCloneMaintenance, Get-HVBaseImageVM, Get-HVBaseImageVMSnapshot