Merge pull request #8428 from knbnnate/master

Salt ver year.month can have 2-digit month
2017-04-11 20:42:42 -07:00 · 2017-04-11 20:42:42 -07:00 · a60fe47965
parent aaa41d5af3 8c31a0c3ff
commit a60fe47965
1 changed files with 1 additions and 1 deletions
--- a/plugins/provisioners/salt/bootstrap-salt.ps1
+++ b/plugins/provisioners/salt/bootstrap-salt.ps1
@ -10,7 +10,7 @@ $ServiceName = "salt-minion"
 $startupType = "Manual"

 # Version to install - default to latest if there is an issue
-If ($version -notmatch "201[0-9]\.[0-9]\.[0-9](\-\d{1})?"){
+If ($version -notmatch "2\d{3}\.\d{1,2}\.\d+(\-\d{1})?"){
  $version = '2015.5.2'
 }