summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorBrian Waldon <bcwaldon@gmail.com>2012-03-26 22:48:48 -0700
committerBrian Waldon <bcwaldon@gmail.com>2012-03-26 22:48:48 -0700
commitc530de638916d29c609f66194569f57234a68289 (patch)
treee44cfc2791b8bf2932573e4a9157cc6144d59d72 /LICENSE
parentb5847df3e203ec83126a3cc903bca58093399b89 (diff)
downloadpython-glanceclient-c530de638916d29c609f66194569f57234a68289.tar.gz
Basic get/list operations work
* 'glance image-list' and 'glance image-show' work * Set up tests, pep8, venv
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE34
1 files changed, 0 insertions, 34 deletions
diff --git a/LICENSE b/LICENSE
index 32b6611..67db858 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,3 @@
-Copyright (c) 2009 Jacob Kaplan-Moss - initial codebase (< v2.1)
-Copyright (c) 2011 Rackspace - OpenStack extensions (>= v2.1)
-Copyright (c) 2011 Nebula, Inc - Keystone refactor (>= v2.7)
-All rights reserved.
-
Apache License
Version 2.0, January 2004
@@ -178,32 +173,3 @@ All rights reserved.
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.
-
---- License for python-keystoneclient versions prior to 2.1 ---
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of this project nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-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.