diff options
| author | Hans Bolinder <[email protected]> | 2016-02-22 13:24:42 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-02-22 13:24:42 +0100 |
| commit | b8cd565e69ee2affbfeee3a9d924265b9222edb9 (patch) | |
| tree | 404043a232715984296b5550ff8620d15924a910 /lib/common_test/src/ct_slave.erl | |
| parent | 2c370def9ddbc34efb16f5dbe8064350c140183a (diff) | |
| parent | 8c5f8128fc167d67fbd5d63205f35eade4cc741f (diff) | |
| download | otp-b8cd565e69ee2affbfeee3a9d924265b9222edb9.tar.gz otp-b8cd565e69ee2affbfeee3a9d924265b9222edb9.tar.bz2 otp-b8cd565e69ee2affbfeee3a9d924265b9222edb9.zip | |
Merge branch 'maint'
* maint:
Fix a few dialyzer warnings
Diffstat (limited to 'lib/common_test/src/ct_slave.erl')
| -rw-r--r-- | lib/common_test/src/ct_slave.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl index 0cd83b9f04..3ad3937548 100644 --- a/lib/common_test/src/ct_slave.erl +++ b/lib/common_test/src/ct_slave.erl @@ -1,7 +1,7 @@ %%-------------------------------------------------------------------- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2015. All Rights Reserved. +%% Copyright Ericsson AB 2010-2016. 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. @@ -315,7 +315,7 @@ enodename(Host, Node) -> do_start(Host, Node, Options) -> ENode = enodename(Host, Node), Functions = - lists:concat([[{ct_slave, slave_started, [ENode, self()]}], + lists:append([[{ct_slave, slave_started, [ENode, self()]}], Options#options.startup_functions, [{ct_slave, slave_ready, [ENode, self()]}]]), Functions2 = if |