From e5875001247e6a6ac4f474157a51a8c54f94ae49 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 14 Mar 2013 16:01:25 +0100 Subject: Convert XML files to UTF-8 --- lib/otp_mibs/doc/src/book.xml | 4 ++-- lib/otp_mibs/doc/src/fascicules.xml | 2 +- lib/otp_mibs/doc/src/introduction.xml | 4 ++-- lib/otp_mibs/doc/src/mibs.xml | 4 ++-- lib/otp_mibs/doc/src/notes.xml | 2 +- lib/otp_mibs/doc/src/otp_mib.xml | 4 ++-- lib/otp_mibs/doc/src/part.xml | 4 ++-- lib/otp_mibs/doc/src/part_notes.xml | 4 ++-- lib/otp_mibs/doc/src/ref_man.xml | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/book.xml b/lib/otp_mibs/doc/src/book.xml index 11d08b8a41..5377685cd3 100644 --- a/lib/otp_mibs/doc/src/book.xml +++ b/lib/otp_mibs/doc/src/book.xml @@ -1,10 +1,10 @@ - +
- 20032009 + 20032013 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/fascicules.xml b/lib/otp_mibs/doc/src/fascicules.xml index 101e745722..c075478967 100644 --- a/lib/otp_mibs/doc/src/fascicules.xml +++ b/lib/otp_mibs/doc/src/fascicules.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/otp_mibs/doc/src/introduction.xml b/lib/otp_mibs/doc/src/introduction.xml index c1ed0fed78..e58c237de2 100644 --- a/lib/otp_mibs/doc/src/introduction.xml +++ b/lib/otp_mibs/doc/src/introduction.xml @@ -1,10 +1,10 @@ - +
- 20032009 + 20032013 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/mibs.xml b/lib/otp_mibs/doc/src/mibs.xml index 16d2ac201a..4e3e849043 100644 --- a/lib/otp_mibs/doc/src/mibs.xml +++ b/lib/otp_mibs/doc/src/mibs.xml @@ -1,10 +1,10 @@ - +
- 20032009 + 20032013 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 8986eab9ad..0c13fb2349 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml index c96b31a1d4..9be25fc7a0 100644 --- a/lib/otp_mibs/doc/src/otp_mib.xml +++ b/lib/otp_mibs/doc/src/otp_mib.xml @@ -1,10 +1,10 @@ - +
- 20032009 + 20032013 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/part.xml b/lib/otp_mibs/doc/src/part.xml index 40988fda69..352a4e33c8 100644 --- a/lib/otp_mibs/doc/src/part.xml +++ b/lib/otp_mibs/doc/src/part.xml @@ -1,10 +1,10 @@ - +
- 20032009 + 20032013 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/part_notes.xml b/lib/otp_mibs/doc/src/part_notes.xml index a7bdde9b64..1212c2d80d 100644 --- a/lib/otp_mibs/doc/src/part_notes.xml +++ b/lib/otp_mibs/doc/src/part_notes.xml @@ -1,10 +1,10 @@ - +
- 20042009 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/ref_man.xml b/lib/otp_mibs/doc/src/ref_man.xml index 1b5d91e9db..d1d5d7f2eb 100644 --- a/lib/otp_mibs/doc/src/ref_man.xml +++ b/lib/otp_mibs/doc/src/ref_man.xml @@ -1,10 +1,10 @@ - +
- 20032009 + 20032013 Ericsson AB. All Rights Reserved. -- cgit v1.2.3 From a793ab815d0c828fb1ef7ba72ab58c1b45542831 Mon Sep 17 00:00:00 2001 From: Tobias Schlager Date: Tue, 16 Jul 2013 11:44:42 +0200 Subject: [otp_mibs] Update types of applicable MIB objects to 64bit based types. --- lib/otp_mibs/mibs/OTP-EVA-MIB.mib | 10 +++++----- lib/otp_mibs/mibs/OTP-MIB.mib | 30 ++++++++++++++++++------------ lib/otp_mibs/mibs/OTP-REG.mib | 8 ++++---- lib/otp_mibs/mibs/OTP-TC.mib | 6 +++--- 4 files changed, 30 insertions(+), 24 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib index 6fbb8ef073..2815251c23 100644 --- a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib +++ b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib @@ -34,7 +34,7 @@ IMPORTS ; otpEvaModule MODULE-IDENTITY - LAST-UPDATED "0305090900Z" + LAST-UPDATED "200305090900Z" ORGANIZATION "Ericsson" CONTACT-INFO "Contact: Erlang Support see license agreement for Erlang/OTP." @@ -42,19 +42,19 @@ otpEvaModule MODULE-IDENTITY "This MIB is part of the OTP MIB. It defines MIB objects for the eva application in OTP." - REVISION "0305090900Z" + REVISION "200305090900Z" DESCRIPTION "Changed CONTACT-INFO as it was outdated, made it more generic to avoid such changes in the future." - REVISION "9801270900Z" + REVISION "199801270900Z" DESCRIPTION "Changed erroneous defintion of alarmCleared notification. Changed erroneous name of this module to otpEvaModule." - REVISION "9712010900Z" + REVISION "199712010900Z" DESCRIPTION "Converted to v2 SMI and placed in the OTP tree." - REVISION "9705020900Z" + REVISION "199705020900Z" DESCRIPTION "The initial version of this MIB module. It is very much inspired by the ANS-ALM-MIB and Axd301Eva-OMS mibs." diff --git a/lib/otp_mibs/mibs/OTP-MIB.mib b/lib/otp_mibs/mibs/OTP-MIB.mib index 2d4c286bc7..22dc21c9c5 100644 --- a/lib/otp_mibs/mibs/OTP-MIB.mib +++ b/lib/otp_mibs/mibs/OTP-MIB.mib @@ -21,7 +21,7 @@ OTP-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, - Counter32, Gauge32, Integer32 + Counter64, Gauge32, Integer32 FROM SNMPv2-SMI TEXTUAL-CONVENTION, DisplayString FROM SNMPv2-TC @@ -32,7 +32,7 @@ IMPORTS ; otpModule MODULE-IDENTITY - LAST-UPDATED "0305090900Z" + LAST-UPDATED "201307160700Z" ORGANIZATION "Ericsson" CONTACT-INFO "Contact: Erlang Support see license agreement for Erlang/OTP." @@ -41,16 +41,22 @@ otpModule MODULE-IDENTITY agent executing at one node only. Each Erlang node in the OTP system is represented by one row in the erlNodeTable." - REVISION "0305090900Z" + REVISION "201307160700Z" + DESCRIPTION + "Updated various types to be able to reflect larger values. + The objects erlNodeReductions, erlNodeInBytes, erlNodeOutBytes as well + as the type MilliSeconds have been updated to Counter64." + + REVISION "200305090900Z" DESCRIPTION "Changed CONTACT-INFO as it was outdated, made it more generic to avoid such changes in the future." - REVISION "9712010900Z" + REVISION "199712010900Z" DESCRIPTION "Converted to v2 SMI and placed in the OTP tree." - REVISION "9608191700Z" + REVISION "199608191700Z" DESCRIPTION "The initial revision of MIB module OTP-MIB." @@ -70,7 +76,7 @@ MilliSeconds ::= TEXTUAL-CONVENTION the time, in milliseconds between two epochs. When objects are defined which use this type, the description of the object identifies both of the reference epochs." - SYNTAX Counter32 + SYNTAX Counter64 -- Managed Objects @@ -103,10 +109,10 @@ ErlNodeEntry ::= SEQUENCE { erlNodeRunQueue Gauge32, erlNodeRunTime MilliSeconds, erlNodeWallClock MilliSeconds, - erlNodeReductions Counter32, + erlNodeReductions Counter64, erlNodeProcesses Gauge32, - erlNodeInBytes Counter32, - erlNodeOutBytes Counter32 + erlNodeInBytes Counter64, + erlNodeOutBytes Counter64 } erlNodeId OBJECT-TYPE @@ -168,7 +174,7 @@ erlNodeWallClock OBJECT-TYPE ::= { erlNodeEntry 7 } erlNodeReductions OBJECT-TYPE - SYNTAX Counter32 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION @@ -184,7 +190,7 @@ erlNodeProcesses OBJECT-TYPE ::= { erlNodeEntry 9 } erlNodeInBytes OBJECT-TYPE - SYNTAX Counter32 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION @@ -192,7 +198,7 @@ erlNodeInBytes OBJECT-TYPE ::= { erlNodeEntry 10 } erlNodeOutBytes OBJECT-TYPE - SYNTAX Counter32 + SYNTAX Counter64 MAX-ACCESS read-only STATUS current DESCRIPTION diff --git a/lib/otp_mibs/mibs/OTP-REG.mib b/lib/otp_mibs/mibs/OTP-REG.mib index c6ef2c67e5..c700f93fd8 100644 --- a/lib/otp_mibs/mibs/OTP-REG.mib +++ b/lib/otp_mibs/mibs/OTP-REG.mib @@ -25,25 +25,25 @@ IMPORTS ; otpRegModule MODULE-IDENTITY - LAST-UPDATED "0305090900Z" + LAST-UPDATED "200305090900Z" ORGANIZATION "Ericsson" CONTACT-INFO "Contact: Erlang Support see license agreement for Erlang/OTP." DESCRIPTION "The root MIB module for OTP." - REVISION "0305090900Z" + REVISION "200305090900Z" DESCRIPTION "Changed CONTACT-INFO as it was outdated, made it more generic to avoid such changes in the future." - REVISION "9902020900Z" + REVISION "199902020900Z" DESCRIPTION "Cleaned up OBJECT IDENTIFIER registration. Changed the name of the MODULE-IDENTITY of this module to non-conflicting name otpRegModule." - REVISION "9712010900Z" + REVISION "199712010900Z" DESCRIPTION "The initial revision of MIB module OTP-REG." ::= { otpModules 1 } diff --git a/lib/otp_mibs/mibs/OTP-TC.mib b/lib/otp_mibs/mibs/OTP-TC.mib index 38c4d05846..9b80e1ccac 100644 --- a/lib/otp_mibs/mibs/OTP-TC.mib +++ b/lib/otp_mibs/mibs/OTP-TC.mib @@ -29,7 +29,7 @@ IMPORTS ; otpTcModule MODULE-IDENTITY - LAST-UPDATED "0305090900Z" + LAST-UPDATED "200305090900Z" ORGANIZATION "Ericsson" CONTACT-INFO "Contact: Erlang Support see license agreement for Erlang/OTP." @@ -37,13 +37,13 @@ otpTcModule MODULE-IDENTITY "This MIB is part of the OTP MIB. It defines common Textual Conventions used in other OTP mib modules." - REVISION "0305090900Z" + REVISION "200305090900Z" DESCRIPTION "Changed CONTACT-INFO as it was outdated, made it more generic to avoid such changes in the future." - REVISION "9712010900Z" + REVISION "199712010900Z" DESCRIPTION "The initial version of this module." ::= { otpModules 2 } -- cgit v1.2.3 From b183cadcaddde7dc903c3fa5540c55e3f1408595 Mon Sep 17 00:00:00 2001 From: Tobias Schlager Date: Tue, 16 Jul 2013 11:46:58 +0200 Subject: [otp_mibs] Add test suite for range checks and reduction value overflow. --- lib/otp_mibs/test/Makefile | 85 ++++++++++++ lib/otp_mibs/test/otp_mibs_SUITE.cfg | 15 +++ lib/otp_mibs/test/otp_mibs_SUITE.erl | 245 +++++++++++++++++++++++++++++++++++ 3 files changed, 345 insertions(+) create mode 100644 lib/otp_mibs/test/Makefile create mode 100644 lib/otp_mibs/test/otp_mibs_SUITE.cfg create mode 100644 lib/otp_mibs/test/otp_mibs_SUITE.erl (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/test/Makefile b/lib/otp_mibs/test/Makefile new file mode 100644 index 0000000000..48c1c5c7d8 --- /dev/null +++ b/lib/otp_mibs/test/Makefile @@ -0,0 +1,85 @@ +# +# %CopyrightBegin% +# +# Copyright Ericsson AB 1997-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% +# +include $(ERL_TOP)/make/target.mk + +include $(ERL_TOP)/make/$(TARGET)/otp.mk + +# ---------------------------------------------------- +# Target Specs +# ---------------------------------------------------- + +MODULES= otp_mibs_SUITE + +EBIN = . + +HRL_FILES= + +ERL_FILES= $(MODULES:%=%.erl) + +TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) + +SOURCE = $(ERL_FILES) $(HRL_FILES) + +EMAKEFILE=Emakefile + +# ---------------------------------------------------- +# Release directory specification +# ---------------------------------------------------- +RELSYSDIR = $(RELEASE_PATH)/otp_mibs_test + +# ---------------------------------------------------- +# FLAGS +# ---------------------------------------------------- +ERL_MAKE_FLAGS += +ERL_COMPILE_FLAGS += \ + -I$(ERL_TOP)/lib/test_server/include \ + -I$(ERL_TOP)/lib/snmp/include + +# ---------------------------------------------------- +# Targets +# ---------------------------------------------------- + +make_emakefile: + $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\ + > $(EMAKEFILE) + +tests debug opt: make_emakefile + erl $(ERL_MAKE_FLAGS) -make + +clean: + rm -f $(EMAKEFILE) + rm -f $(TARGET_FILES) + rm -f core *~ + +docs: + + +# ---------------------------------------------------- +# Release Target +# ---------------------------------------------------- +include $(ERL_TOP)/make/otp_release_targets.mk + +release_spec: + +release_tests_spec: make_emakefile + $(INSTALL_DIR) "$(RELSYSDIR)" + $(INSTALL_DATA) $(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)" + $(INSTALL_DATA) otp_mibs_SUITE.cfg "$(RELSYSDIR)" + +release_docs_spec: diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.cfg b/lib/otp_mibs/test/otp_mibs_SUITE.cfg new file mode 100644 index 0000000000..d01cf92104 --- /dev/null +++ b/lib/otp_mibs/test/otp_mibs_SUITE.cfg @@ -0,0 +1,15 @@ +%% -*- erlang -*- +{snmp, + [ + {start_agent,true}, + {users, + [ + {otp_mibs_test,[snmpm_user_default,[]]} + ]}, + {managed_agents, + [ + {otp_mibs_test, [otp_mibs_test, {127,0,0,1}, 4000, []]} + ]}, + {agent_sysname,"Test otp_mibs"}, + {mgr_port,5001} + ]}. diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl new file mode 100644 index 0000000000..5fd52ac2ac --- /dev/null +++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl @@ -0,0 +1,245 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 2004-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(otp_mibs_SUITE). + +%%----------------------------------------------------------------- +%% This suite can no longer be executed standalone, i.e. it must be +%% executed with common test. The reason is that ct_snmp is used +%% instead of the snmp application directly. The suite requires a +%% config file, otp_mibs_SUITE.cfg, found in the same directory as +%% the suite. +%% +%% Execute with: +%% > ct_run -suite otp_mibs_SUITE -config otp_mibs_SUITE.cfg +%%----------------------------------------------------------------- + +-include_lib("test_server/include/test_server.hrl"). +-include_lib("otp_mibs/include/OTP-MIB.hrl"). +-include_lib("snmp/include/snmp_types.hrl"). + +% Test server specific exports +-export([all/0, + suite/0, + groups/0, + init_per_group/2, + end_per_group/2, + init_per_suite/1, + end_per_suite/1, + init_per_testcase/2, + end_per_testcase/2]). + +% Test cases must be exported. +-export([nt_basic_types/1, nt_high_reduction_count/1]). + +-define(TRAP_UDP, 5000). +-define(AGENT_UDP, 4000). +-define(CONF_FILE_VER, [v2]). +-define(SYS_NAME, "Test otp_mibs"). +-define(MAX_MSG_SIZE, 484). +-define(ENGINE_ID, "mgrEngine"). +-define(MGR_PORT, 5001). + +%% Since some cases are only interested in single entries of the OTP-MIB's +%% node table, one row must be chosen. The first row should be sufficient +%% for this. +-define(NODE_ENTRY, 1). + +%%--------------------------------------------------------------------- +%% CT setup +%%--------------------------------------------------------------------- + +init_per_testcase(_Case, Config) when is_list(Config) -> + Dog = test_server:timetrap(test_server:minutes(6)), + [{watchdog, Dog}|Config]. + +end_per_testcase(_Case, Config) when is_list(Config) -> + Dog = ?config(watchdog, Config), + test_server:timetrap_cancel(Dog), + Config. + +suite() -> [{ct_hooks,[ts_install_cth]}, {require, snmp_mgr_agent, snmp}]. + +all() -> [{group, node_table}]. + +groups() -> [{node_table, [], [nt_basic_types, nt_high_reduction_count]}]. + +init_per_group(_GroupName, Config) -> Config. + +end_per_group(_GroupName, Config) -> Config. + +init_per_suite(Config) -> + ?line application:start(sasl), + ?line application:start(mnesia), + ?line application:start(otp_mibs), + + ok = ct_snmp:start(Config,snmp_mgr_agent), + + %% Load the mibs that should be tested + otp_mib:load(snmp_master_agent), + + Config. + +end_per_suite(Config) -> + PrivDir = ?config(priv_dir, Config), + ConfDir = filename:join(PrivDir,"conf"), + DbDir = filename:join(PrivDir,"db"), + MgrDir = filename:join(PrivDir, "mgr"), + + %% Uload mibs + otp_mib:unload(snmp_master_agent), + + %% Clean up + application:stop(snmp), + application:stop(mnesia), + application:stop(otp_mibs), + + del_dir(ConfDir), + del_dir(DbDir), + (catch del_dir(MgrDir)), + ok. + +%%--------------------------------------------------------------------- +%% Test cases +%%--------------------------------------------------------------------- + +nt_basic_types(suite) -> + []; +nt_basic_types(doc) -> + ["Query every item of the node table and check its variable " + "type and content for sensible values."]; +nt_basic_types(Config) when is_list(Config) -> + ok = otp_mib:update_erl_node_table(), + + NodeNameId = ?erlNodeEntry ++ [?erlNodeName, ?NODE_ENTRY], + {noError, 0, [NodeNameVal]} = snmp_get([NodeNameId]), + #varbind{variabletype = 'OCTET STRING'} = NodeNameVal, + true = is_list(NodeNameVal#varbind.value), + + NodeMachineId = ?erlNodeEntry ++ [?erlNodeMachine, ?NODE_ENTRY], + {noError, 0, [NodeMachineVal]} = snmp_get([NodeMachineId]), + #varbind{variabletype = 'OCTET STRING'} = NodeMachineVal, + true = is_list(NodeMachineVal#varbind.value), + + NodeVersionId = ?erlNodeEntry ++ [?erlNodeVersion, ?NODE_ENTRY], + {noError, 0, [NodeVersionVal]} = snmp_get([NodeVersionId]), + #varbind{variabletype = 'OCTET STRING'} = NodeVersionVal, + true = is_list(NodeVersionVal#varbind.value), + + NodeRunQueueId = ?erlNodeEntry ++ [?erlNodeRunQueue, ?NODE_ENTRY], + {noError, 0, [NodeRunQueueVal]} = snmp_get([NodeRunQueueId]), + #varbind{variabletype = 'Unsigned32'} = NodeRunQueueVal, + true = is_integer(NodeRunQueueVal#varbind.value), + NodeRunQueueVal#varbind.value >= 0, + NodeRunQueueVal#varbind.value =< 4294967295, + + NodeRunTimeId = ?erlNodeEntry ++ [?erlNodeRunTime, ?NODE_ENTRY], + {noError, 0, [NodeRunTimeVal]} = snmp_get([NodeRunTimeId]), + #varbind{variabletype = 'Counter64'} = NodeRunTimeVal, + true = is_integer(NodeRunTimeVal#varbind.value), + NodeRunTimeVal#varbind.value >= 0, + NodeRunTimeVal#varbind.value =< 18446744073709551615, + + NodeWallClockId = ?erlNodeEntry ++ [?erlNodeWallClock, ?NODE_ENTRY], + {noError, 0, [NodeWallClockVal]} = snmp_get([NodeWallClockId]), + #varbind{variabletype = 'Counter64'} = NodeWallClockVal, + true = is_integer(NodeWallClockVal#varbind.value), + NodeWallClockVal#varbind.value >= 0, + NodeWallClockVal#varbind.value =< 18446744073709551615, + + NodeReductionsId = ?erlNodeEntry ++ [?erlNodeReductions, ?NODE_ENTRY], + {noError, 0, [NodeReductionsVal]} = snmp_get([NodeReductionsId]), + #varbind{variabletype = 'Counter64'} = NodeReductionsVal, + true = is_integer(NodeReductionsVal#varbind.value), + NodeReductionsVal#varbind.value >= 0, + NodeReductionsVal#varbind.value =< 18446744073709551615, + + NodeProcessesId = ?erlNodeEntry ++ [?erlNodeProcesses, ?NODE_ENTRY], + {noError, 0, [NodeProcessesVal]} = snmp_get([NodeProcessesId]), + #varbind{variabletype = 'Unsigned32'} = NodeProcessesVal, + true = is_integer(NodeProcessesVal#varbind.value), + NodeProcessesVal#varbind.value >= 0, + NodeProcessesVal#varbind.value =< 4294967295, + + NodeInBytesId = ?erlNodeEntry ++ [?erlNodeInBytes, ?NODE_ENTRY], + {noError, 0, [NodeInBytesVal]} = snmp_get([NodeInBytesId]), + #varbind{variabletype = 'Counter64'} = NodeInBytesVal, + true = is_integer(NodeInBytesVal#varbind.value), + NodeInBytesVal#varbind.value >= 0, + NodeInBytesVal#varbind.value =< 18446744073709551615, + + NodeOutBytesId = ?erlNodeEntry ++ [?erlNodeOutBytes, ?NODE_ENTRY], + {noError, 0, [NodeOutBytesVal]} = snmp_get([NodeOutBytesId]), + #varbind{variabletype = 'Counter64'} = NodeOutBytesVal, + true = is_integer(NodeOutBytesVal#varbind.value), + NodeOutBytesVal#varbind.value >= 0, + NodeOutBytesVal#varbind.value =< 18446744073709551615, + + ok. + +nt_high_reduction_count(suite) -> + []; +nt_high_reduction_count(doc) -> + ["Check that no error occurs when the erlNodeReductions field" + "exceeds the 32bit boundary, this may take about 10min."]; +nt_high_reduction_count(Config) when is_list(Config) -> + NodeReductions = ?erlNodeEntry ++ [?erlNodeReductions, ?NODE_ENTRY], + + BumpFun = fun(F, Limit) -> + case erlang:statistics(reductions) of + {Total, _} when Total < Limit -> + F(F, Limit); + _ -> + ok + end + end, + + ok = otp_mib:update_erl_node_table(), + + {noError, 0, [StartVal]} = snmp_get([NodeReductions]), + #varbind{variabletype = 'Counter64'} = StartVal, + true = is_integer(StartVal#varbind.value), + StartVal#varbind.value >= 0, + case StartVal#varbind.value =< 4294967295 of + true -> + ok = otp_mib:update_erl_node_table(), + BumpFun(BumpFun, 4294967295), + {noError, 0, [EndVal]} = snmp_get([NodeReductions]), + #varbind{variabletype = 'Counter64'} = EndVal, + true = is_integer(EndVal#varbind.value), + EndVal#varbind.value >= 4294967295, + EndVal#varbind.value =< 18446744073709551615; + false -> + %% no need to bump more reductions, since the initial get + %% command already returned successfully with a large value + ok + end. + +%%--------------------------------------------------------------------- +%% Internal functions +%%--------------------------------------------------------------------- + +snmp_get(OIdList) -> + ct_snmp:get_values(otp_mibs_test, OIdList, snmp_mgr_agent). + +del_dir(Dir) -> + io:format("Deleting: ~s~n",[Dir]), + {ok, Files} = file:list_dir(Dir), + FullPathFiles = lists:map(fun(File) -> filename:join(Dir, File) end, Files), + lists:foreach(fun file:delete/1, FullPathFiles), + file:del_dir(Dir). -- cgit v1.2.3 From 92fa944c70d5eb2ce8585004c947dbe958d37cfd Mon Sep 17 00:00:00 2001 From: Tobias Schlager Date: Tue, 16 Jul 2013 11:48:10 +0200 Subject: [otp_mibs] Add type based integer value truncation/reset. This fixes errors when querying e.g. the erlNodeReductions, erlNodeInBytes and erlNodeOutBytes objects in long-running Erlang/OTP systems. --- lib/otp_mibs/src/otp_mib.erl | 69 +++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 26 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl index 619104007c..9d52ce1fab 100644 --- a/lib/otp_mibs/src/otp_mib.erl +++ b/lib/otp_mibs/src/otp_mib.erl @@ -1,26 +1,26 @@ %% %% %CopyrightBegin% -%% +%% %% Copyright Ericsson AB 1996-2011. 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(otp_mib). %%%----------------------------------------------------------------- %%% Description: This module implements the OTP-MIB. %%% The tables are implemented as shadow tables with the module -%%% snmp_shadow_table. +%%% snmp_shadow_table. %%%----------------------------------------------------------------- %% API @@ -35,9 +35,9 @@ %% Exported for internal use via rpc -export([get_erl_node/1, get_appls/1]). -%% Shadow tables +%% Shadow tables -record(erlNodeTable, - {erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion, + {erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion, erlNodeRunQueue, erlNodeRunTime, erlNodeWallClock, erlNodeReductions, erlNodeProcesses, erlNodeInBytes, erlNodeOutBytes}). @@ -45,13 +45,13 @@ -record(applTable, {key = '_', applName = '_', applDescr = '_', applVsn = '_'}). -%% Shadow argument macros --define(erlNodeShadowArgs, +%% Shadow argument macros +-define(erlNodeShadowArgs, {erlNodeTable, integer, record_info(fields, erlNodeTable), 5000, fun otp_mib:update_erl_node_table/0}). -define(applShadowArgs, - {applTable, {integer, integer}, record_info(fields, applTable), + {applTable, {integer, integer}, record_info(fields, applTable), 5000, fun otp_mib:update_appl_table/0}). %% Misc @@ -79,14 +79,14 @@ load(Agent) -> %%------------------------------------------------------------------------- unload(Agent) -> snmpa:unload_mibs(Agent, ["OTP-MIB"]). - + %%%========================================================================= %%% SNMP instrumentation %%%========================================================================= erl_node_table(new) -> Tab = erlNodeAlloc, - Storage = ram_copies, + Storage = ram_copies, case lists:member(Tab, mnesia:system_info(tables)) of true -> case mnesia:table_info(Tab, storage_type) of @@ -101,12 +101,12 @@ erl_node_table(new) -> {attributes, record_info(fields, erlNodeAlloc)}, {local_content, true}, {Storage, Nodes}], - {atomic, ok} = mnesia:create_table(Tab, Props) + {atomic, ok} = mnesia:create_table(Tab, Props) end, ok = mnesia:dirty_write({erlNodeAlloc, next_index, 1}), update_node_alloc([node() | nodes()]), snmp_shadow_table:table_func(new, ?erlNodeShadowArgs). - + erl_node_table(Op, RowIndex, Cols) -> snmp_shadow_table:table_func(Op, RowIndex, Cols, ?erlNodeShadowArgs). @@ -148,21 +148,26 @@ update_appl_table() -> %%% Exported for internal use via rpc %%%======================================================================== get_erl_node(Id) -> + RunQueue = erlang:statistics(run_queue), + RunTime = element(1, erlang:statistics(runtime)), + WallClock = element(1, erlang:statistics(wall_clock)), + Reductions = element(1, erlang:statistics(reductions)), + Processes = length(processes()), IO = erlang:statistics(io), - #erlNodeTable{erlNodeId = Id, + InBytes = element(2, element(1, IO)), + OutBytes = element(2, element(2, IO)), + #erlNodeTable{erlNodeId = truncate_int('Integer32', Id), erlNodeName = atom_to_list(node()), erlNodeVersion = erlang:system_info(version), erlNodeMachine = erlang:system_info(machine), - erlNodeRunQueue = erlang:statistics(run_queue), - erlNodeRunTime = element(1, erlang:statistics(runtime)), - erlNodeWallClock = - element(1, erlang:statistics(wall_clock)), - erlNodeReductions = - element(1, erlang:statistics(reductions)), - erlNodeProcesses = length(processes()), - erlNodeInBytes = element(2, element(1, IO)), - erlNodeOutBytes = element(2, element(2, IO))}. - + erlNodeRunQueue = truncate_int('Unsigned32', RunQueue), + erlNodeRunTime = truncate_int('Counter64', RunTime), + erlNodeWallClock = truncate_int('Counter64', WallClock), + erlNodeReductions = truncate_int('Counter64', Reductions), + erlNodeProcesses = truncate_int('Unsigned32', Processes), + erlNodeInBytes = truncate_int('Counter64', InBytes), + erlNodeOutBytes = truncate_int('Counter64', OutBytes)}. + get_appls(NodeId) -> element(1, lists:mapfoldl( @@ -181,7 +186,7 @@ update_node_alloc([Node | T]) -> case mnesia:dirty_read({erlNodeAlloc, Node}) of [] -> [{_, _, Idx}] = mnesia:dirty_read({erlNodeAlloc, next_index}), - ok = mnesia:dirty_write(#erlNodeAlloc{nodeName = Node, + ok = mnesia:dirty_write(#erlNodeAlloc{nodeName = Node, nodeId = Idx}), ok = mnesia:dirty_write({erlNodeAlloc, next_index, Idx + 1}); _ -> @@ -196,3 +201,15 @@ delete_all(Key, Name) -> Next = mnesia:dirty_next(Name, Key), ok = mnesia:dirty_delete({Name, Key}), delete_all(Next, Name). + +%% This will return a value limited to fit into the specified type. +%% While counter types will be resetted, other integer types will +%% only be restricted to the valid range. +truncate_int('Counter64', Value) when Value < 0 -> 0; +truncate_int('Counter64', Value) -> Value rem 18446744073709551615; +truncate_int('Unsigned32', Value) when Value < 0 -> 0; +truncate_int('Unsigned32', Value) when Value > 4294967295 -> 4294967295; +truncate_int('Unsigned32', Value) -> Value; +truncate_int('Integer32', Value) when Value < -2147483648 -> -2147483648; +truncate_int('Integer32', Value) when Value > 2147483647 -> 2147483647; +truncate_int('Integer32', Value) -> Value. -- cgit v1.2.3 From a61f66e1157b0e77839b76ef416f436f28304579 Mon Sep 17 00:00:00 2001 From: Tobias Schlager Date: Tue, 18 Feb 2014 12:29:01 +0100 Subject: Fix library application appup files As discussed in issue #240 *all* OTP library applications use the '.*' wildcard as up and down version. This makes library applications always up- and downgradeable. Using the wildcard version obsoletes all maintenance tasks regarding library applications' appup files. Additionally, it prevents upgrade problems caused by automatically included application dependencies when using reltool to create releases. Missing copyright headers are now consistently present. --- lib/otp_mibs/src/otp_mibs.appup.src | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/src/otp_mibs.appup.src b/lib/otp_mibs/src/otp_mibs.appup.src index 5e99dfe325..fd5ce1e391 100644 --- a/lib/otp_mibs/src/otp_mibs.appup.src +++ b/lib/otp_mibs/src/otp_mibs.appup.src @@ -1,7 +1,7 @@ -%% +%% -*- erlang -*- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2009. All Rights Reserved. +%% Copyright Ericsson AB 2003-2014. 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 @@ -15,6 +15,7 @@ %% under the License. %% %% %CopyrightEnd% -%% - -{"%VSN%",[],[]}. +{"%VSN%", + [{<<".*">>,[{restart_application, otp_mibs}]}], + [{<<".*">>,[{restart_application, otp_mibs}]}] +}. -- cgit v1.2.3 From 841addf5d64a3b4775cd1d0a5aa4bf04ec4ef95e Mon Sep 17 00:00:00 2001 From: Tobias Schlager Date: Tue, 18 Feb 2014 12:33:31 +0100 Subject: Add test suites performing app and appup file checks Add the mentioned test suites for *all* library and touched non-library applications. --- lib/otp_mibs/test/otp_mibs_SUITE.erl | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl index 5fd52ac2ac..5376c54210 100644 --- a/lib/otp_mibs/test/otp_mibs_SUITE.erl +++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl @@ -45,7 +45,7 @@ end_per_testcase/2]). % Test cases must be exported. --export([nt_basic_types/1, nt_high_reduction_count/1]). +-export([app/1, appup/1, nt_basic_types/1, nt_high_reduction_count/1]). -define(TRAP_UDP, 5000). -define(AGENT_UDP, 4000). @@ -75,9 +75,10 @@ end_per_testcase(_Case, Config) when is_list(Config) -> suite() -> [{ct_hooks,[ts_install_cth]}, {require, snmp_mgr_agent, snmp}]. -all() -> [{group, node_table}]. +all() -> [{group, app}, {group, node_table}]. -groups() -> [{node_table, [], [nt_basic_types, nt_high_reduction_count]}]. +groups() -> [{app, [], [app, appup]}, + {node_table, [], [nt_basic_types, nt_high_reduction_count]}]. init_per_group(_GroupName, Config) -> Config. @@ -118,6 +119,14 @@ end_per_suite(Config) -> %% Test cases %%--------------------------------------------------------------------- +%% Test that the otp_mibs app file is ok +app(Config) when is_list(Config) -> + ok = ?t:app_test(otp_mibs). + +%% Test that the otp_mibs appup file is ok +appup(Config) when is_list(Config) -> + ok = ?t:appup_test(otp_mibs). + nt_basic_types(suite) -> []; nt_basic_types(doc) -> -- cgit v1.2.3 From 7bc03971cfe09a2acbcd3bdaef1069af6272b127 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Mon, 10 Mar 2014 17:11:58 +0100 Subject: Bump versions and ensure that all are "normal" versions Ensure all are "normal" versions according to the new version scheme introduced in OTP 17.0 --- lib/otp_mibs/vsn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 96d3088224..98db21c132 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.0.8 +OTP_MIBS_VSN = 1.0.9 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From 22ff87a0c8db877e3ce53b6ff915dcc6a75c5c0c Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Mon, 10 Mar 2014 17:15:38 +0100 Subject: Introduce runtime_dependencies in .app files Most dependencies introduced are exactly the dependencies to other applications found by xref. That is, there might be real dependencies missing. There might also be pure debug dependencies listed that probably should be removed. Each application has to be manually inspected in order to ensure that all real dependencies are listed. All dependencies introduced are to application versions used in OTP 17.0. This since the previously used version scheme wasn't designed for this, and in order to minimize the work of introducing the dependencies. --- lib/otp_mibs/src/otp_mibs.app.src | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/src/otp_mibs.app.src b/lib/otp_mibs/src/otp_mibs.app.src index b177af0709..ebc656b0b2 100644 --- a/lib/otp_mibs/src/otp_mibs.app.src +++ b/lib/otp_mibs/src/otp_mibs.app.src @@ -23,5 +23,7 @@ {modules, [otp_mib]}, {registered, []}, {applications, [kernel, stdlib, snmp]}, - {env,[]}]}. + {env,[]}, + {runtime_dependencies, ["stdlib-2.0","snmp-4.25.1","mnesia-4.12", + "kernel-3.0","erts-6.0"]}]}. -- cgit v1.2.3 From f719d0fe308f00b85f92c29d7cdf9b0dc20d98a2 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 7 Apr 2014 19:52:48 +0200 Subject: Update release notes --- lib/otp_mibs/doc/src/notes.xml | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 0c13fb2349..391c82b1c5 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -31,6 +31,55 @@

This document describes the changes made to the OTP_Mibs application.

+
Otp_Mibs 1.0.9 + +
Fixed Bugs and Malfunctions + + +

+ Add type based integer value truncation/reset.

+

+ This fixes errors when querying e.g. the + erlNodeReductions, erlNodeInBytes and erlNodeOutBytes + objects in long-running Erlang/OTP systems.

+

+ Update types of applicable MIB objects to 64bit based + types.

+

+ Potential incompatibility: Type change of Counter32 to + Counter64 in OTP-MIB.mib

+

+ (Thanks to Tobias Schlager)

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11203

+ + +

+ Application upgrade (appup) files are corrected for the + following applications:

+

+ asn1, common_test, compiler, crypto, debugger, + dialyzer, edoc, eldap, erl_docgen, et, eunit, gs, hipe, + inets, observer, odbc, os_mon, otp_mibs, parsetools, + percept, public_key, reltool, runtime_tools, ssh, + syntax_tools, test_server, tools, typer, webtool, wx, + xmerl

+

+ A new test utility for testing appup files is added to + test_server. This is now used by most applications in + OTP.

+

+ (Thanks to Tobias Schlager)

+

+ Own Id: OTP-11744

+ + +
+ +
+
Otp_Mibs 1.0.8
Improvements and New Features -- cgit v1.2.3 From 0ce2323d8c68eb59e02aa46f920b5097886614f3 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Tue, 17 Jun 2014 21:41:27 +0400 Subject: Fix a typo in clean section of otp_mibs makefile There is no such variable $(TARGETS_FILES) (with S) --- lib/otp_mibs/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile index 4f03d0228a..6096240bbd 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -72,7 +72,7 @@ ERL_COMPILE_FLAGS += -I$(INCLUDE) +warn_obsolete_guard debug opt: $(TARGETS) clean: - rm -f $(TARGETS_FILES) + rm -f $(TARGET_FILES) rm -f $(APP_TARGET) rm -f $(APPUP_TARGET) rm -f core -- cgit v1.2.3 From 7f3486a5ddc02a366f2945dfd009c4a2697a2b98 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 9 Dec 2014 15:21:47 +0100 Subject: Prepare release --- lib/otp_mibs/doc/src/notes.xml | 16 ++++++++++++++++ lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 391c82b1c5..c61978c99e 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -31,6 +31,22 @@

This document describes the changes made to the OTP_Mibs application.

+
Otp_Mibs 1.0.10 + +
Fixed Bugs and Malfunctions + + +

+ Make sure the clean rule for ssh, ssl, eunit and otp_mibs + actually removes generated files.

+

+ Own Id: OTP-12200

+ + +
+ +
+
Otp_Mibs 1.0.9
Fixed Bugs and Malfunctions diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 98db21c132..2ff59431f4 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.0.9 +OTP_MIBS_VSN = 1.0.10 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From 738c34d4bb8f1a3811acd00af8c6c12107f8315b Mon Sep 17 00:00:00 2001 From: Bruce Yinhe Date: Thu, 18 Jun 2015 11:31:02 +0200 Subject: Change license text to APLv2 --- lib/otp_mibs/Makefile | 21 +++++++++++---------- lib/otp_mibs/doc/src/Makefile | 21 +++++++++++---------- lib/otp_mibs/doc/src/book.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/introduction.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/mibs.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/notes.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/otp_mib.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/part.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/part_notes.xml | 21 +++++++++++---------- lib/otp_mibs/doc/src/ref_man.xml | 21 +++++++++++---------- lib/otp_mibs/mibs/Makefile | 21 +++++++++++---------- lib/otp_mibs/mibs/OTP-EVA-MIB.mib | 19 ++++++++++--------- lib/otp_mibs/mibs/OTP-MIB.mib | 19 ++++++++++--------- lib/otp_mibs/mibs/OTP-REG.mib | 19 ++++++++++--------- lib/otp_mibs/mibs/OTP-TC.mib | 19 ++++++++++--------- lib/otp_mibs/src/Makefile | 21 +++++++++++---------- lib/otp_mibs/src/otp_mib.erl | 19 ++++++++++--------- lib/otp_mibs/src/otp_mibs.app.src | 21 +++++++++++---------- lib/otp_mibs/src/otp_mibs.appup.src | 21 +++++++++++---------- lib/otp_mibs/test/Makefile | 19 ++++++++++--------- lib/otp_mibs/test/otp_mibs_SUITE.erl | 19 ++++++++++--------- 21 files changed, 224 insertions(+), 203 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/Makefile b/lib/otp_mibs/Makefile index a88f0fef69..2dfab524fd 100644 --- a/lib/otp_mibs/Makefile +++ b/lib/otp_mibs/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 2003-2009. 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. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/otp_mibs/doc/src/Makefile b/lib/otp_mibs/doc/src/Makefile index 6b8610bc23..3f9d8cc004 100644 --- a/lib/otp_mibs/doc/src/Makefile +++ b/lib/otp_mibs/doc/src/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 2003-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. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/otp_mibs/doc/src/book.xml b/lib/otp_mibs/doc/src/book.xml index 5377685cd3..1c3a3fdea4 100644 --- a/lib/otp_mibs/doc/src/book.xml +++ b/lib/otp_mibs/doc/src/book.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/introduction.xml b/lib/otp_mibs/doc/src/introduction.xml index e58c237de2..4236e45aae 100644 --- a/lib/otp_mibs/doc/src/introduction.xml +++ b/lib/otp_mibs/doc/src/introduction.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/mibs.xml b/lib/otp_mibs/doc/src/mibs.xml index 4e3e849043..11900d3399 100644 --- a/lib/otp_mibs/doc/src/mibs.xml +++ b/lib/otp_mibs/doc/src/mibs.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index c61978c99e..26f79a5c07 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml index 9be25fc7a0..bf9c474ec4 100644 --- a/lib/otp_mibs/doc/src/otp_mib.xml +++ b/lib/otp_mibs/doc/src/otp_mib.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/part.xml b/lib/otp_mibs/doc/src/part.xml index 352a4e33c8..c03254f96e 100644 --- a/lib/otp_mibs/doc/src/part.xml +++ b/lib/otp_mibs/doc/src/part.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/part_notes.xml b/lib/otp_mibs/doc/src/part_notes.xml index 1212c2d80d..be65d59fdb 100644 --- a/lib/otp_mibs/doc/src/part_notes.xml +++ b/lib/otp_mibs/doc/src/part_notes.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/doc/src/ref_man.xml b/lib/otp_mibs/doc/src/ref_man.xml index d1d5d7f2eb..52576b160b 100644 --- a/lib/otp_mibs/doc/src/ref_man.xml +++ b/lib/otp_mibs/doc/src/ref_man.xml @@ -8,16 +8,17 @@ Ericsson AB. 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. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/otp_mibs/mibs/Makefile b/lib/otp_mibs/mibs/Makefile index 7f43ef31a6..01333dcac4 100644 --- a/lib/otp_mibs/mibs/Makefile +++ b/lib/otp_mibs/mibs/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 1997-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. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib index 2815251c23..24031478dc 100644 --- a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib +++ b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib @@ -3,16 +3,17 @@ -- -- Copyright Ericsson AB 2004-2009. 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/. +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at -- --- 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. +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. -- -- %CopyrightEnd% -- diff --git a/lib/otp_mibs/mibs/OTP-MIB.mib b/lib/otp_mibs/mibs/OTP-MIB.mib index 22dc21c9c5..8d7d920765 100644 --- a/lib/otp_mibs/mibs/OTP-MIB.mib +++ b/lib/otp_mibs/mibs/OTP-MIB.mib @@ -3,16 +3,17 @@ -- -- Copyright Ericsson AB 1996-2009. 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/. +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at -- --- 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. +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. -- -- %CopyrightEnd% -- diff --git a/lib/otp_mibs/mibs/OTP-REG.mib b/lib/otp_mibs/mibs/OTP-REG.mib index c700f93fd8..68b4ee3882 100644 --- a/lib/otp_mibs/mibs/OTP-REG.mib +++ b/lib/otp_mibs/mibs/OTP-REG.mib @@ -3,16 +3,17 @@ -- -- Copyright Ericsson AB 1997-2009. 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/. +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at -- --- 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. +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. -- -- %CopyrightEnd% -- diff --git a/lib/otp_mibs/mibs/OTP-TC.mib b/lib/otp_mibs/mibs/OTP-TC.mib index 9b80e1ccac..ca7625f9e2 100644 --- a/lib/otp_mibs/mibs/OTP-TC.mib +++ b/lib/otp_mibs/mibs/OTP-TC.mib @@ -3,16 +3,17 @@ -- -- Copyright Ericsson AB 1997-2009. 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/. +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at -- --- 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. +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. -- -- %CopyrightEnd% -- diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile index 6096240bbd..03892cd43d 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 2003-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. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl index 9d52ce1fab..bd814e01e0 100644 --- a/lib/otp_mibs/src/otp_mib.erl +++ b/lib/otp_mibs/src/otp_mib.erl @@ -3,16 +3,17 @@ %% %% Copyright Ericsson AB 1996-2011. 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/. +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at %% -%% 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. +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. %% %% %CopyrightEnd% %% diff --git a/lib/otp_mibs/src/otp_mibs.app.src b/lib/otp_mibs/src/otp_mibs.app.src index ebc656b0b2..f4eb34d627 100644 --- a/lib/otp_mibs/src/otp_mibs.app.src +++ b/lib/otp_mibs/src/otp_mibs.app.src @@ -3,16 +3,17 @@ %% %% Copyright Ericsson AB 2003-2009. 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. +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. %% %% %CopyrightEnd% %% diff --git a/lib/otp_mibs/src/otp_mibs.appup.src b/lib/otp_mibs/src/otp_mibs.appup.src index fd5ce1e391..6b8fe71775 100644 --- a/lib/otp_mibs/src/otp_mibs.appup.src +++ b/lib/otp_mibs/src/otp_mibs.appup.src @@ -3,16 +3,17 @@ %% %% Copyright Ericsson AB 2003-2014. 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. +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. %% %% %CopyrightEnd% {"%VSN%", diff --git a/lib/otp_mibs/test/Makefile b/lib/otp_mibs/test/Makefile index 48c1c5c7d8..e1cfbb347d 100644 --- a/lib/otp_mibs/test/Makefile +++ b/lib/otp_mibs/test/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 1997-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/. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# 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. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl index 5376c54210..abb5aa8194 100644 --- a/lib/otp_mibs/test/otp_mibs_SUITE.erl +++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl @@ -3,16 +3,17 @@ %% %% Copyright Ericsson AB 2004-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/. +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at %% -%% 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. +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. %% %% %CopyrightEnd% %% -- cgit v1.2.3 From 2955ddebc32837b66d9bacb4e925ad0ed0033168 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 23 Jun 2015 10:24:26 +0200 Subject: Prepare release --- lib/otp_mibs/doc/src/notes.xml | 16 ++++++++++++++++ lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 26f79a5c07..5dd112e937 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -32,6 +32,22 @@

This document describes the changes made to the OTP_Mibs application.

+
Otp_Mibs 1.1 + +
Improvements and New Features + + +

+ Change license text from Erlang Public License to Apache + Public License v2

+

+ Own Id: OTP-12845

+ + +
+ +
+
Otp_Mibs 1.0.10
Fixed Bugs and Malfunctions diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 2ff59431f4..38436d363e 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.0.10 +OTP_MIBS_VSN = 1.1 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From 03fcb7dabf8861e60ffab4121a909b347bccfec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 15 Feb 2016 15:33:12 +0100 Subject: Eliminate use of test_server.hrl and test_server_line.hrl As a first step to removing the test_server application as as its own separate application, change the inclusion of test_server.hrl to an inclusion of ct.hrl and remove the inclusion of test_server_line.hrl. --- lib/otp_mibs/test/otp_mibs_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl index abb5aa8194..4d1eb155cd 100644 --- a/lib/otp_mibs/test/otp_mibs_SUITE.erl +++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl @@ -30,7 +30,7 @@ %% > ct_run -suite otp_mibs_SUITE -config otp_mibs_SUITE.cfg %%----------------------------------------------------------------- --include_lib("test_server/include/test_server.hrl"). +-include_lib("common_test/include/ct.hrl"). -include_lib("otp_mibs/include/OTP-MIB.hrl"). -include_lib("snmp/include/snmp_types.hrl"). -- cgit v1.2.3 From 4e1162bbdf88465a03da165c088ad1256b816956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 15 Feb 2016 16:04:32 +0100 Subject: Makefiles: Remove test_server from include path and code path Since no test suites includede test_server.hrl, there is no need to have test_server in the include path or code path. --- lib/otp_mibs/test/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/test/Makefile b/lib/otp_mibs/test/Makefile index e1cfbb347d..18d7e915db 100644 --- a/lib/otp_mibs/test/Makefile +++ b/lib/otp_mibs/test/Makefile @@ -49,7 +49,6 @@ RELSYSDIR = $(RELEASE_PATH)/otp_mibs_test # ---------------------------------------------------- ERL_MAKE_FLAGS += ERL_COMPILE_FLAGS += \ - -I$(ERL_TOP)/lib/test_server/include \ -I$(ERL_TOP)/lib/snmp/include # ---------------------------------------------------- -- cgit v1.2.3 From 6664eed554974336909d3ffe03f20349cc4c38fd Mon Sep 17 00:00:00 2001 From: Henrik Nord Date: Tue, 15 Mar 2016 15:19:56 +0100 Subject: update copyright-year --- lib/otp_mibs/Makefile | 2 +- lib/otp_mibs/doc/src/Makefile | 2 +- lib/otp_mibs/doc/src/book.xml | 2 +- lib/otp_mibs/doc/src/introduction.xml | 2 +- lib/otp_mibs/doc/src/mibs.xml | 2 +- lib/otp_mibs/doc/src/notes.xml | 2 +- lib/otp_mibs/doc/src/otp_mib.xml | 2 +- lib/otp_mibs/doc/src/part.xml | 2 +- lib/otp_mibs/doc/src/part_notes.xml | 2 +- lib/otp_mibs/doc/src/ref_man.xml | 2 +- lib/otp_mibs/mibs/Makefile | 2 +- lib/otp_mibs/mibs/OTP-EVA-MIB.mib | 2 +- lib/otp_mibs/mibs/OTP-MIB.mib | 2 +- lib/otp_mibs/mibs/OTP-REG.mib | 2 +- lib/otp_mibs/mibs/OTP-TC.mib | 2 +- lib/otp_mibs/src/Makefile | 2 +- lib/otp_mibs/src/otp_mib.erl | 2 +- lib/otp_mibs/src/otp_mibs.app.src | 2 +- lib/otp_mibs/src/otp_mibs.appup.src | 2 +- lib/otp_mibs/test/Makefile | 2 +- lib/otp_mibs/test/otp_mibs_SUITE.erl | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/Makefile b/lib/otp_mibs/Makefile index 2dfab524fd..64bd683c7a 100644 --- a/lib/otp_mibs/Makefile +++ b/lib/otp_mibs/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2009. All Rights Reserved. +# Copyright Ericsson AB 2003-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. diff --git a/lib/otp_mibs/doc/src/Makefile b/lib/otp_mibs/doc/src/Makefile index 3f9d8cc004..62698b9300 100644 --- a/lib/otp_mibs/doc/src/Makefile +++ b/lib/otp_mibs/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2012. All Rights Reserved. +# Copyright Ericsson AB 2003-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. diff --git a/lib/otp_mibs/doc/src/book.xml b/lib/otp_mibs/doc/src/book.xml index 1c3a3fdea4..482da46876 100644 --- a/lib/otp_mibs/doc/src/book.xml +++ b/lib/otp_mibs/doc/src/book.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/introduction.xml b/lib/otp_mibs/doc/src/introduction.xml index 4236e45aae..7046cbb8ae 100644 --- a/lib/otp_mibs/doc/src/introduction.xml +++ b/lib/otp_mibs/doc/src/introduction.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/mibs.xml b/lib/otp_mibs/doc/src/mibs.xml index 11900d3399..a32d5ea5f5 100644 --- a/lib/otp_mibs/doc/src/mibs.xml +++ b/lib/otp_mibs/doc/src/mibs.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 5dd112e937..7beac5ffcb 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20042013 + 20042016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml index bf9c474ec4..681ce9fa2d 100644 --- a/lib/otp_mibs/doc/src/otp_mib.xml +++ b/lib/otp_mibs/doc/src/otp_mib.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/part.xml b/lib/otp_mibs/doc/src/part.xml index c03254f96e..0a8ddce268 100644 --- a/lib/otp_mibs/doc/src/part.xml +++ b/lib/otp_mibs/doc/src/part.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/part_notes.xml b/lib/otp_mibs/doc/src/part_notes.xml index be65d59fdb..5c03d28720 100644 --- a/lib/otp_mibs/doc/src/part_notes.xml +++ b/lib/otp_mibs/doc/src/part_notes.xml @@ -4,7 +4,7 @@
- 20042013 + 20042016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/doc/src/ref_man.xml b/lib/otp_mibs/doc/src/ref_man.xml index 52576b160b..06c5aadcd9 100644 --- a/lib/otp_mibs/doc/src/ref_man.xml +++ b/lib/otp_mibs/doc/src/ref_man.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/otp_mibs/mibs/Makefile b/lib/otp_mibs/mibs/Makefile index 01333dcac4..11d790d014 100644 --- a/lib/otp_mibs/mibs/Makefile +++ b/lib/otp_mibs/mibs/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2012. All Rights Reserved. +# Copyright Ericsson AB 1997-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. diff --git a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib index 24031478dc..4d0c53ed95 100644 --- a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib +++ b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib @@ -1,7 +1,7 @@ -- -- %CopyrightBegin% -- --- Copyright Ericsson AB 2004-2009. All Rights Reserved. +-- Copyright Ericsson AB 2004-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. diff --git a/lib/otp_mibs/mibs/OTP-MIB.mib b/lib/otp_mibs/mibs/OTP-MIB.mib index 8d7d920765..693319eae4 100644 --- a/lib/otp_mibs/mibs/OTP-MIB.mib +++ b/lib/otp_mibs/mibs/OTP-MIB.mib @@ -1,7 +1,7 @@ -- -- %CopyrightBegin% -- --- Copyright Ericsson AB 1996-2009. All Rights Reserved. +-- Copyright Ericsson AB 1996-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. diff --git a/lib/otp_mibs/mibs/OTP-REG.mib b/lib/otp_mibs/mibs/OTP-REG.mib index 68b4ee3882..bf1585061c 100644 --- a/lib/otp_mibs/mibs/OTP-REG.mib +++ b/lib/otp_mibs/mibs/OTP-REG.mib @@ -1,7 +1,7 @@ -- -- %CopyrightBegin% -- --- Copyright Ericsson AB 1997-2009. All Rights Reserved. +-- Copyright Ericsson AB 1997-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. diff --git a/lib/otp_mibs/mibs/OTP-TC.mib b/lib/otp_mibs/mibs/OTP-TC.mib index ca7625f9e2..efe5451f0c 100644 --- a/lib/otp_mibs/mibs/OTP-TC.mib +++ b/lib/otp_mibs/mibs/OTP-TC.mib @@ -1,7 +1,7 @@ -- -- %CopyrightBegin% -- --- Copyright Ericsson AB 1997-2009. All Rights Reserved. +-- Copyright Ericsson AB 1997-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. diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile index 03892cd43d..4023f50d48 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2012. All Rights Reserved. +# Copyright Ericsson AB 2003-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. diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl index bd814e01e0..1431818be4 100644 --- a/lib/otp_mibs/src/otp_mib.erl +++ b/lib/otp_mibs/src/otp_mib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-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. diff --git a/lib/otp_mibs/src/otp_mibs.app.src b/lib/otp_mibs/src/otp_mibs.app.src index f4eb34d627..75ef25c366 100644 --- a/lib/otp_mibs/src/otp_mibs.app.src +++ b/lib/otp_mibs/src/otp_mibs.app.src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2009. All Rights Reserved. +%% Copyright Ericsson AB 2003-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. diff --git a/lib/otp_mibs/src/otp_mibs.appup.src b/lib/otp_mibs/src/otp_mibs.appup.src index 6b8fe71775..9437ae2222 100644 --- a/lib/otp_mibs/src/otp_mibs.appup.src +++ b/lib/otp_mibs/src/otp_mibs.appup.src @@ -1,7 +1,7 @@ %% -*- erlang -*- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2014. All Rights Reserved. +%% Copyright Ericsson AB 2003-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. diff --git a/lib/otp_mibs/test/Makefile b/lib/otp_mibs/test/Makefile index 18d7e915db..9736cf8bce 100644 --- a/lib/otp_mibs/test/Makefile +++ b/lib/otp_mibs/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2012. All Rights Reserved. +# Copyright Ericsson AB 1997-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. diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl index 4d1eb155cd..cb3cd28200 100644 --- a/lib/otp_mibs/test/otp_mibs_SUITE.erl +++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2012. All Rights Reserved. +%% Copyright Ericsson AB 2004-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. -- cgit v1.2.3 From bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 11 May 2016 17:22:23 +0200 Subject: Prepare release --- lib/otp_mibs/doc/src/notes.xml | 15 +++++++++++++++ lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 7beac5ffcb..dbd2f47ffb 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -32,6 +32,21 @@

This document describes the changes made to the OTP_Mibs application.

+
Otp_Mibs 1.1.1 + +
Improvements and New Features + + +

+ Internal changes

+

+ Own Id: OTP-13551

+ + +
+ +
+
Otp_Mibs 1.1
Improvements and New Features diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 38436d363e..7a793007ee 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.1 +OTP_MIBS_VSN = 1.1.1 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From 663e847459686604ea051f036a0e4caff18cea6f Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 12 May 2016 12:04:14 +0200 Subject: Revert "Prepare release" This reverts commit bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a. --- lib/otp_mibs/doc/src/notes.xml | 15 --------------- lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index dbd2f47ffb..7beac5ffcb 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -32,21 +32,6 @@

This document describes the changes made to the OTP_Mibs application.

-
Otp_Mibs 1.1.1 - -
Improvements and New Features - - -

- Internal changes

-

- Own Id: OTP-13551

- - -
- -
-
Otp_Mibs 1.1
Improvements and New Features diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 7a793007ee..38436d363e 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.1.1 +OTP_MIBS_VSN = 1.1 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From e020f75c10410a6943cd055bfa072a2641eab7da Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 2 Jun 2016 10:55:26 +0200 Subject: Prepare release --- lib/otp_mibs/doc/src/notes.xml | 15 +++++++++++++++ lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 7beac5ffcb..dbd2f47ffb 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -32,6 +32,21 @@

This document describes the changes made to the OTP_Mibs application.

+
Otp_Mibs 1.1.1 + +
Improvements and New Features + + +

+ Internal changes

+

+ Own Id: OTP-13551

+ + +
+ +
+
Otp_Mibs 1.1
Improvements and New Features diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 38436d363e..7a793007ee 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.1 +OTP_MIBS_VSN = 1.1.1 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From c04cad3ba921deb086d19e2de2526af4854add75 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 2 Jun 2016 11:39:07 +0200 Subject: Revert "Prepare release" This reverts commit e020f75c10410a6943cd055bfa072a2641eab7da. --- lib/otp_mibs/doc/src/notes.xml | 15 --------------- lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index dbd2f47ffb..7beac5ffcb 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -32,21 +32,6 @@

This document describes the changes made to the OTP_Mibs application.

-
Otp_Mibs 1.1.1 - -
Improvements and New Features - - -

- Internal changes

-

- Own Id: OTP-13551

- - -
- -
-
Otp_Mibs 1.1
Improvements and New Features diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 7a793007ee..38436d363e 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.1.1 +OTP_MIBS_VSN = 1.1 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3 From 6e51c6d19612d03abc81b86bb70b8d7da678ce5d Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 21 Jun 2016 15:12:41 +0200 Subject: Prepare release --- lib/otp_mibs/doc/src/notes.xml | 15 +++++++++++++++ lib/otp_mibs/vsn.mk | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'lib/otp_mibs') diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml index 7beac5ffcb..dbd2f47ffb 100644 --- a/lib/otp_mibs/doc/src/notes.xml +++ b/lib/otp_mibs/doc/src/notes.xml @@ -32,6 +32,21 @@

This document describes the changes made to the OTP_Mibs application.

+
Otp_Mibs 1.1.1 + +
Improvements and New Features + + +

+ Internal changes

+

+ Own Id: OTP-13551

+ + +
+ +
+
Otp_Mibs 1.1
Improvements and New Features diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk index 38436d363e..7a793007ee 100644 --- a/lib/otp_mibs/vsn.mk +++ b/lib/otp_mibs/vsn.mk @@ -1,4 +1,4 @@ -OTP_MIBS_VSN = 1.1 +OTP_MIBS_VSN = 1.1.1 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and # should NOT be used again. -- cgit v1.2.3