diff options
| author | Henrik Nord <[email protected]> | 2018-09-21 12:25:11 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2018-09-21 12:25:11 +0200 |
| commit | e3cdf8208a08fe6ceb283108729aee6315af9547 (patch) | |
| tree | 124403a63fd4ed09e029b46ecf30f87660fbacf3 /lib/ssh | |
| parent | ab62dd2e77afac117f431bda449da811b140c153 (diff) | |
| parent | d04b53936d5e9f84a3066ecd466993671b1428bf (diff) | |
| download | otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.gz otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.bz2 otp-e3cdf8208a08fe6ceb283108729aee6315af9547.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_xfer.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_bench_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl index 7bb9c2d101..1d77ccb311 100644 --- a/lib/ssh/src/ssh_xfer.erl +++ b/lib/ssh/src/ssh_xfer.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/lib/ssh/test/ssh_bench_SUITE.erl b/lib/ssh/test/ssh_bench_SUITE.erl index 441cf97234..764c52b624 100644 --- a/lib/ssh/test/ssh_bench_SUITE.erl +++ b/lib/ssh/test/ssh_bench_SUITE.erl @@ -1,7 +1,7 @@ %%%------------------------------------------------------------------- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2015-2017. All Rights Reserved. +%% Copyright Ericsson AB 2015-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. |