Merge branch 'master' of https://github.com/sqlcollaborative/dbatools

dataplat · Dec 1, 2018 · 6b2f0fb · 6b2f0fb
2 parents dcb63f5 + 12e86ce
commit 6b2f0fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/allcommands.ps1.REMOVED.git-id b/allcommands.ps1.REMOVED.git-id
@@ -1 +1 @@
-47d99dd28a60dbf9d299b05af839a35c32efda1d
+85afdaa7e4f84985bd868fcac3cbc2a3a6295e4d
diff --git a/dbatools.psd1 b/dbatools.psd1
@@ -64,7 +64,7 @@
 
     # Modules to import as nested modules of the module specified in ModuleToProcess
     NestedModules          = @()
-    
+
     # Functions to export from this module
     # Specific functions to export for Core, etc are also found in psm1
     # FunctionsToExport specifically helps with AUTO-LOADING so do not remove
@@ -603,7 +603,7 @@
         'Select-DbaObject',
         'Set-DbatoolsConfig'
         )
-        
+
     # Variables to export from this module
     VariablesToExport      = ''
 

diff --git a/internal/functions/Install-SqlServerUpdate.ps1 b/internal/functions/Install-SqlServerUpdate.ps1
@@ -75,7 +75,6 @@ function Install-SqlServerUpdate {
         foreach ($currentVersion in $currentVersionGroups) {
             $stepCounter = 0
             $currentMajorVersion = "SQL" + $currentVersion.NameLevel
-
             Write-ProgressHelper -ExcludePercent -Activity $activity -Message "Parsing versions"
             # create a parameter set for Find-SqlServerUpdate
             $kbLookupParams = @{
@@ -146,7 +145,6 @@ function Install-SqlServerUpdate {
             }
             ## Find the installer to use
             Write-ProgressHelper -ExcludePercent -Activity $activity -Message "Searching for update binaries"
-
             $installer = Find-SqlServerUpdate @kbLookupParams
             if (!$installer) {
                 Stop-Function -Message "Could not find installer for the $currentMajorVersion update KB$($kbLookupParams.KB)" -Continue
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		47d99dd28a60dbf9d299b05af839a35c32efda1d
		85afdaa7e4f84985bd868fcac3cbc2a3a6295e4d