aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_internal.hrl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-05-02 08:30:50 +0000
committerErlang/OTP <[email protected]>2010-05-02 08:30:50 +0000
commit3a68c36ca7aed71d643ea29460e36fec7e56817d (patch)
tree0899b533f3076b55368ba6aa9710172db8a22a4f /lib/test_server/src/test_server_internal.hrl
parentc7a4c9375a7236826c5c31927f60e72684f6a230 (diff)
parente5c6b79fba89208f0d293ad69f5fd802931c08e2 (diff)
downloadotp-3a68c36ca7aed71d643ea29460e36fec7e56817d.tar.gz
otp-3a68c36ca7aed71d643ea29460e36fec7e56817d.tar.bz2
otp-3a68c36ca7aed71d643ea29460e36fec7e56817d.zip
Merge branch 'bg/remove-stray-ose-support' into dev
* bg/remove-stray-ose-support: configure: Remove stray OSE/Delta support Makefiles: Remove stray OSE/Delta support kernel tests: Remove stray OSE/Delta support system tests: Remove stray OSE/Delta support erl_interface tests: Remove stray OSE/Delta support epmd: Remove stray OSE/Delta support epmd: #ifdef out start_epmd() for other platforms than VxWorks emulator tests: Remove stray OSE/Delta support emulator: Remove stray OSE/Delta support emulator: Eliminate #ifdef for sys_tty_reset() test_server: Remove stray support for OSE/Delta OTP-8585 bg/remove-stray-ose-support
Diffstat (limited to 'lib/test_server/src/test_server_internal.hrl')
-rw-r--r--lib/test_server/src/test_server_internal.hrl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/test_server/src/test_server_internal.hrl b/lib/test_server/src/test_server_internal.hrl
index 6fa5ef75b1..c9c52854e3 100644
--- a/lib/test_server/src/test_server_internal.hrl
+++ b/lib/test_server/src/test_server_internal.hrl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2002-2010. 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%
%%
@@ -37,7 +37,7 @@
username, % string()
cookie, % string(); Cookie for target node
naming, % string(); "-name" | "-sname"
- master, % string(); For OSE this is the master
+ master, % string(); Was used for OSE's master
% node for main target and slave nodes.
% For other platforms the target node
% itself is master for slave nodes