diff options
| author | Bruce Yinhe <[email protected]> | 2015-06-22 15:42:56 +0200 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2015-06-22 15:44:54 +0200 |
| commit | 8f63667b316cdff10e666b8f5b0b6a92bd722e5a (patch) | |
| tree | 0c4497adc35cdcffc411e5168e2b052bf495ca8d /lib/os_mon/mibs | |
| parent | 35b20eb172a077b363af37d27c320b759d42869d (diff) | |
| parent | 6bed12016e0d300b8afc65b5aa8f282dcaa6525e (diff) | |
| download | otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.tar.gz otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.tar.bz2 otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.zip | |
Merge branch 'bruce/change-license'
OTP-12845
* bruce/change-license:
fix errors caused by changed line numbers
Change license text to APLv2
Diffstat (limited to 'lib/os_mon/mibs')
| -rw-r--r-- | lib/os_mon/mibs/Makefile | 21 | ||||
| -rw-r--r-- | lib/os_mon/mibs/OTP-OS-MON-MIB.mib | 19 |
2 files changed, 21 insertions, 19 deletions
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile index 19f3dc8367..725dd0f6a7 100644 --- a/lib/os_mon/mibs/Makefile +++ b/lib/os_mon/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/os_mon/mibs/OTP-OS-MON-MIB.mib b/lib/os_mon/mibs/OTP-OS-MON-MIB.mib index d6ababdcea..0bc5d62872 100644 --- a/lib/os_mon/mibs/OTP-OS-MON-MIB.mib +++ b/lib/os_mon/mibs/OTP-OS-MON-MIB.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% -- |