diff options
| -rw-r--r-- | MAINTAINERS.md | 1 | ||||
| -rw-r--r-- | MAINTAINERS.toml | 24 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/ssh.rb | 3 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | spec/unit/knife/ssh_spec.rb | 11 |
7 files changed, 27 insertions, 18 deletions
diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 8f47b40aef..b0474b5f09 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -99,6 +99,7 @@ To mention the team, use @chef/provisioning * [John Keiser](https://github.com/jkeiser) * [Stuart Preston](https://github.com/stuartpreston) * [JJ Asghar](https://github.com/jjasghar) +* [João Cravo](https://github.com/joaogbcravo) ## Platform Specific Components diff --git a/MAINTAINERS.toml b/MAINTAINERS.toml index a75a2f532e..9501c6d049 100644 --- a/MAINTAINERS.toml +++ b/MAINTAINERS.toml @@ -107,7 +107,8 @@ Chef Provisioning and Drivers. Supported Drivers are listed in the [README](htt maintainers = [ "jkeiser", "stuartpreston", - "jjasghar" + "jjasghar", + "joaogbcravo", ] [Org.Components.Subsystems] @@ -191,20 +192,20 @@ The specific components of Chef related to a given platform - including (but not title = "Cisco NX-OS" team = "client-nxos" - lieutenant = "cperry" + lieutenant = "adamleff" maintainers = [ - "cperry" + "adamleff" ] [Org.Components.Subsystems.CiscoIOSXR] title = "Cisco IOS XR" team = "client-iosxr" - lieutenant = "cperry" + lieutenant = "adamleff" maintainers = [ - "cperry" + "adamleff" ] [Org.Components.Subsystems.Fedora] @@ -279,6 +280,10 @@ The specific components of Chef related to a given platform - including (but not Name = "Adam Jacob" GitHub = "adamhjk" + [people.adamleff] + Name = "Adam Leff" + GitHub = "adamleff" + [people.Aevin1387] Name = "Cory Stephenson" GitHub = "Aevin1387" @@ -383,10 +388,6 @@ The specific components of Chef related to a given platform - including (but not Name = "Matt Wrock" GitHub = "mwrock" - [people.cperry] - Name = "Carl Perry" - GitHub = "edolnx" - [people.tas50] Name = "Tim Smith" GitHub = "tas50" @@ -404,3 +405,8 @@ The specific components of Chef related to a given platform - including (but not GitHub = "jjasghar" Twitter = "jjasghar" IRC = "j^2" + + [people.joaogbcravo] + Name = "João Cravo" + GitHub = "joaogbcravo" + Twitter = "joaogbcravo" @@ -1 +1 @@ -12.9.30
\ No newline at end of file +12.9.33
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 65305acfce..cea2d22d9d 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.9.30" + VERSION = "12.9.33" end # diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index 31356b6f48..2bbcbfc79e 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -84,7 +84,8 @@ class Chef :short => "-t SECONDS", :long => "--ssh-timeout SECONDS", :description => "The ssh connection timeout", - :proc => Proc.new { |key| Chef::Config[:knife][:ssh_timeout] = key.strip.to_i } + :proc => Proc.new { |key| Chef::Config[:knife][:ssh_timeout] = key.strip.to_i }, + :default => 120 option :ssh_gateway, :short => "-G GATEWAY", diff --git a/lib/chef/version.rb b/lib/chef/version.rb index c1588c4bb4..473a533674 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.9.30" + VERSION = "12.9.33" end # diff --git a/spec/unit/knife/ssh_spec.rb b/spec/unit/knife/ssh_spec.rb index 65cc5a97b4..44a133d858 100644 --- a/spec/unit/knife/ssh_spec.rb +++ b/spec/unit/knife/ssh_spec.rb @@ -203,8 +203,14 @@ describe Chef::Knife::Ssh do expect(@knife.session.servers[0].port).to eq(123) end + it "defaults to a timeout of 120 seconds" do + @knife.session_from_list([["the.b.org", nil]]) + expect(@knife.session.servers[0].options[:timeout]).to eq(120) + end + it "uses the timeout from Chef Config" do Chef::Config[:knife][:ssh_timeout] = 5 + @knife.config[:ssh_timeout] = nil @knife.session_from_list([["the.b.org", nil]]) expect(@knife.session.servers[0].options[:timeout]).to eq(5) end @@ -215,11 +221,6 @@ describe Chef::Knife::Ssh do expect(@knife.session.servers[0].options[:timeout]).to eq(6) end - it "defaults to no timeout" do - @knife.session_from_list([["the.b.org", nil]]) - expect(@knife.session.servers[0].options[:timeout]).to eq(nil) - end - it "uses the user from an ssh config file" do @knife.session_from_list([["the.b.org", 123]]) expect(@knife.session.servers[0].user).to eq("locutus") |