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 /erts/emulator/test | |
parent | ab62dd2e77afac117f431bda449da811b140c153 (diff) | |
parent | d04b53936d5e9f84a3066ecd466993671b1428bf (diff) | |
download | otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.gz otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.bz2 otp-e3cdf8208a08fe6ceb283108729aee6315af9547.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test')
-rw-r--r-- | erts/emulator/test/node_container_SUITE.erl | 2 | ||||
-rw-r--r-- | erts/emulator/test/ref_SUITE.erl | 2 | ||||
-rw-r--r-- | erts/emulator/test/scheduler_SUITE.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl index 55135fbcbc..300b4ed036 100644 --- a/erts/emulator/test/node_container_SUITE.erl +++ b/erts/emulator/test/node_container_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2017. All Rights Reserved. +%% Copyright Ericsson AB 2002-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/erts/emulator/test/ref_SUITE.erl b/erts/emulator/test/ref_SUITE.erl index 74df857c65..925c30caa5 100644 --- a/erts/emulator/test/ref_SUITE.erl +++ b/erts/emulator/test/ref_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2016. All Rights Reserved. +%% Copyright Ericsson AB 1999-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/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl index d98edd1ec2..f04efb9003 100644 --- a/erts/emulator/test/scheduler_SUITE.erl +++ b/erts/emulator/test/scheduler_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2017. All Rights Reserved. +%% Copyright Ericsson AB 2008-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. |