diff options
| author | Erlang/OTP <[email protected]> | 2014-05-27 13:42:18 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-05-27 13:42:18 +0200 |
| commit | 12df8e06cc9792971c46f5992de9bbe0eaac6192 (patch) | |
| tree | dcb0813c302d7fa9d472acda70502d41823b4404 /erts/Makefile.in | |
| parent | aa00b0090da89ca7442a5ff837e49a450638ce6a (diff) | |
| parent | b21d30d84e1790107aaa8cc7b39eb1095dea1fca (diff) | |
| download | otp-12df8e06cc9792971c46f5992de9bbe0eaac6192.tar.gz otp-12df8e06cc9792971c46f5992de9bbe0eaac6192.tar.bz2 otp-12df8e06cc9792971c46f5992de9bbe0eaac6192.zip | |
Merge branch 'hans/ssh/patch-17.0.2' into maint-17
* hans/ssh/patch-17.0.2:
ssh: Prepare for release
ssh: Use correct timeout value for the connection timeout
ssh: Add max_session parameter to ssh:daemon
Diffstat (limited to 'erts/Makefile.in')
0 files changed, 0 insertions, 0 deletions