Merge remote-tracking branch 'refs/remotes/vmware/master'

2017-01-20 19:29:40 +05:30
parent dd8906d65f 4ec117e6fe
commit 7ad1b05c29
3 changed files with 28 additions and 5 deletions
--- a/Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1
+++ b/Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1
@@ -6604,10 +6604,6 @@ function Get-HVMachineSummary {
  }

  $machineList = Find-HVMachine -Param $PSBoundParameters
-  if (!$machineList) {
-    Write-Host "No Virtual Machine(s) Found with given search parameters"
-    break
-  }
  return $machineList
 }

--- a/Modules/VMware.VMEncryption/VMware.VMEncryption.psm1
+++ b/Modules/VMware.VMEncryption/VMware.VMEncryption.psm1
@@ -274,7 +274,7 @@ Function Set-vMotionEncryptionConfig {
        [Parameter(Mandatory=$True,ValueFromPipeline=$True,ValueFromPipelinebyPropertyName=$True)]
        [VMware.VimAutomation.ViCore.Types.V1.Inventory.VirtualMachine]$VM,

-        [Parameter(Mandatory=$True]
+        [Parameter(Mandatory=$True)]
        [ValidateSet("disabled", "opportunistic", "required")]
        [String]$Encryption
    )