upstream/oracle/userland-gate: comparison components/python/cinderclient/cinderclient.license

equal deleted inserted replaced

-:e3c34501ae8e
+:1b782154d546
 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.
 Copyright (c) 2009 Jacob Kaplan-Moss - initial codebase (< v2.1)
 Copyright (c) 2011 Rackspace - OpenStack extensions (>= v2.1)
 All rights reserved.
-		                 Apache License
+Apache License
 Version 2.0, January 2004
 http://www.apache.org/licenses/
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 of any other Contributor, and only if You agree to indemnify,
 defend, and hold each Contributor harmless for any liability
 incurred by, or claims asserted against, such Contributor by reason
 of your accepting any such warranty or additional liability.
-END OF TERMS AND CONDITIONS
+--- License for python-cinderclient versions prior to 2.1 ---
-APPENDIX: How to apply the Apache License to your work.
+All rights reserved.
-To apply the Apache License to your work, attach the following
+Redistribution and use in source and binary forms, with or without
-boilerplate notice, with the fields enclosed by brackets "[]"
+modification, are permitted provided that the following conditions are met:
-replaced with your own identifying information. (Don't include
-the brackets!)  The text should be enclosed in the appropriate
+1. Redistributions of source code must retain the above copyright notice,
-comment syntax for the file format. We also recommend that a
+this list of conditions and the following disclaimer.
-file or class name and description of purpose be included on the
-same "printed page" as the copyright notice for easier
+2. Redistributions in binary form must reproduce the above copyright
-identification within third-party archives.
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
-Copyright [yyyy] [name of copyright owner]
+3. Neither the name of this project nor the names of its contributors may
-Licensed under the Apache License, Version 2.0 (the "License");
+be used to endorse or promote products derived from this software without
-you may not use this file except in compliance with the License.
+specific prior written permission.
-You may obtain a copy of the License at
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-http://www.apache.org/licenses/LICENSE-2.0
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-Unless required by applicable law or agreed to in writing, software
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-distributed under the License is distributed on an "AS IS" BASIS,
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-See the License for the specific language governing permissions and
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-limitations under the License.
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+============================================================
+Additional license/copyrights seen:
+#!/usr/bin/env python
+# Copyright (c) 2013, Nebula, Inc.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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. 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.
+#
+# Colorizer Code is borrowed from Twisted:
+# Copyright (c) 2001-2010 Twisted Matrix Laboratories.
+#
+#    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.

changeset 6822	1b782154d546
parent 1760	353323c7bdc1