diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-02-01 13:51:50 -0800 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-02-01 13:51:50 -0800 |
| commit | 85bc209cf1e20bc49fe436b60529b4e3114f490e (patch) | |
| tree | cfed5b844131344e978fa5f8a9f1b35aad0eb938 | |
| parent | b026a472a36576adff838873f19e2d5d10a60853 (diff) | |
| parent | 8e842358671a7ff2d549888c522c7e49e34c6088 (diff) | |
| download | chef-85bc209cf1e20bc49fe436b60529b4e3114f490e.tar.gz | |
Merge pull request #4498 from chef/version
correct windows 10 major/minor version numbers
| -rw-r--r-- | lib/chef/win32/version.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/win32/version.rb b/lib/chef/win32/version.rb index 85a71491df..57abdbbebb 100644 --- a/lib/chef/win32/version.rb +++ b/lib/chef/win32/version.rb @@ -48,8 +48,8 @@ class Chef private_class_method :method_name_from_marketing_name WIN_VERSIONS = { - "Windows 10" => {:major => 6, :minor => 4, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }}, - "Windows Server 10" => {:major => 6, :minor => 4, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }}, + "Windows 10" => {:major => 10, :minor => 0, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }}, + "Windows Server 2016" => {:major => 10, :minor => 0, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }}, "Windows 8.1" => {:major => 6, :minor => 3, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }}, "Windows Server 2012 R2" => {:major => 6, :minor => 3, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }}, "Windows 8" => {:major => 6, :minor => 2, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }}, |