diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-11-24 22:11:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 22:11:02 +0300 |
| commit | b98bfcf3fd07ea65926246e9ce329331e3240b97 (patch) | |
| tree | 5a97e7c524e55e98a7508427fd5202c27e1fe559 | |
| parent | d6e9f16c202935341fd2f7550280eb5304f7be67 (diff) | |
| parent | b58f6dcdc802bea6d3790a9db43f43da33be69dc (diff) | |
| download | rabbitmq-server-git-b98bfcf3fd07ea65926246e9ce329331e3240b97.tar.gz | |
Merge pull request #1037 from rabbitmq/rabbitmq-common-139
Move mochi licensing info to rabbit_common
| -rw-r--r-- | LICENSE | 3 | ||||
| -rw-r--r-- | LICENSE-MIT-Mochi | 9 |
2 files changed, 0 insertions, 12 deletions
@@ -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. |