diff options
| author | Anders Svensson <[email protected]> | 2012-08-28 15:07:17 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-28 15:07:17 +0200 |
| commit | e3ba184dbd850ae43f43c9e4167120edc509a53e (patch) | |
| tree | f161731738a0c6383307f1610c8a71638426ce16 /lib/diameter/test/diameter_reg_SUITE.erl | |
| parent | f6b0856e2fed9266e81878a6f780f6db2b80c7df (diff) | |
| parent | ff76a60146dfa246efbfbed7f82de12df83bc862 (diff) | |
| download | otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.tar.gz otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.tar.bz2 otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/test/diameter_reg_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_reg_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl index ec6a0ca731..4939019f7a 100644 --- a/lib/diameter/test/diameter_reg_SUITE.erl +++ b/lib/diameter/test/diameter_reg_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2011. All Rights Reserved. +%% Copyright Ericsson AB 2010-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -43,7 +43,7 @@ %% =========================================================================== suite() -> - [{timetrap, {seconds, 10}}]. + [{timetrap, {seconds, 60}}]. all() -> [{group, all}, |