summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Hoguin <essen@ninenines.eu>2016-11-24 16:07:58 +0100
committerLoïc Hoguin <essen@ninenines.eu>2016-11-24 16:07:58 +0100
commitb58f6dcdc802bea6d3790a9db43f43da33be69dc (patch)
tree86e11d2963540751dca0fe5f241f722c26101432
parent283e4d0c9547597b2270d5f868610fb194b4de63 (diff)
downloadrabbitmq-server-git-b58f6dcdc802bea6d3790a9db43f43da33be69dc.tar.gz
Move mochi licensing info to rabbit_common
-rw-r--r--LICENSE3
-rw-r--r--LICENSE-MIT-Mochi9
2 files changed, 0 insertions, 12 deletions
diff --git a/LICENSE b/LICENSE
index 86b189fe04..8964048501 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,5 @@
This package, the RabbitMQ server is licensed under the MPL. For the
MPL, please see LICENSE-MPL-RabbitMQ.
-The files `mochinum.erl' and `mochiweb_util.erl` are (c) 2007 Mochi Media, Inc and
-licensed under a MIT license, see LICENSE-MIT-Mochi.
-
If you have any questions regarding licensing, please contact us at
info@rabbitmq.com.
diff --git a/LICENSE-MIT-Mochi b/LICENSE-MIT-Mochi
deleted file mode 100644
index c85b65a4d3..0000000000
--- a/LICENSE-MIT-Mochi
+++ /dev/null
@@ -1,9 +0,0 @@
-This is the MIT license.
-
-Copyright (c) 2007 Mochi Media, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.