Skip to content

Commit

Permalink
Merge pull request puppetlabs#780 from adreyer/revert-ssh-port
Browse files Browse the repository at this point in the history
Revert "Merge pull request puppetlabs#779 from structuralartistry/fix_ssh_port"
  • Loading branch information
adreyer committed Dec 6, 2018
2 parents 4a50b15 + 277bac2 commit 8cb0a13
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/bolt/transport/ssh/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def connect
end
end

options[:port] = target.port || 22
options[:port] = target.port if target.port
options[:password] = target.password if target.password
# Support both net-ssh 4 and 5. We use 5 in packaging, but Beaker pins to 4 so we
# want the gem to be compatible with version 4.
Expand Down

0 comments on commit 8cb0a13

Please sign in to comment.