diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 16:38:19 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 16:38:19 +0200 |
| commit | 182564757661d6cd507d2e92d175c61602a25394 (patch) | |
| tree | d64c68c681706dba93d1ce6ab16998419b57d184 /lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl | |
| parent | 4173064b7044d72f650cf459683793acc9e29352 (diff) | |
| parent | b337ca6109902c4713016d2ab366c0bfb6cc1a2e (diff) | |
| download | otp-182564757661d6cd507d2e92d175c61602a25394.tar.gz otp-182564757661d6cd507d2e92d175c61602a25394.tar.bz2 otp-182564757661d6cd507d2e92d175c61602a25394.zip | |
Merge remote branch 'origin/peppe/common_test/verbosity_level' into maint
* origin/peppe/common_test/verbosity_level:
Fix doc build error
Implement verbosity levels and parameter for log printout importance
Conflicts:
lib/common_test/src/ct_logs.erl
lib/common_test/src/ct_run.erl
lib/common_test/src/ct_testspec.erl
lib/common_test/src/ct_util.hrl
lib/common_test/test/Makefile
OTP-9625
OTP-10067
Diffstat (limited to 'lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl index 423cb2999b..7704a29768 100644 --- a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl +++ b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl @@ -1,11 +1,21 @@ -%%%------------------------------------------------------------------- -%%% @author Peter Andersson <[email protected]> -%%% @copyright (C) 2012, Peter Andersson -%%% @doc -%%% -%%% @end -%%% Created : 23 Jan 2012 by Peter Andersson <[email protected]> -%%%------------------------------------------------------------------- +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 2009-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 +%% compliance with the License. You should have received a copy of the +%% Erlang Public License along with this software. If not, it can be +%% retrieved online at http://www.erlang.org/. +%% +%% Software distributed under the License is distributed on an "AS IS" +%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +%% the License for the specific language governing rights and limitations +%% under the License. +%% +%% %CopyrightEnd% +%% -module(priv_dir_SUITE). -compile(export_all). |