Skip to content
This repository
Browse code

Updated license

  • Loading branch information...
commit fa5e6908c2739b8d3aad540d5ba4a65b083810b7 1 parent 66c0599
Ned Wolpert authored March 12, 2010

Showing 2 changed files with 11 additions and 23 deletions. Show diff stats Hide diff stats

  1. 32  LICENSE.txt
  2. 2  README
32  LICENSE.txt
... ...
@@ -1,25 +1,13 @@
1  
-Copyright (c) 2010, Ned Wolpert <ned.wolpert@imemories.com>
2  
-All rights reserved.
  1
+   Copyright 2010 Ned Wolpert <ned.wolpert@imemories.com>
3 2
 
4  
-Redistribution and use in source and binary forms, with or without
5  
-modification, are permitted provided that the following conditions are met:
  3
+   Licensed under the Apache License, Version 2.0 (the "License");
  4
+   you may not use this file except in compliance with the License.
  5
+   You may obtain a copy of the License at
6 6
 
7  
-    * Redistributions of source code must retain the above copyright notice,
8  
-      this list of conditions and the following disclaimer.
9  
-    * Redistributions in binary form must reproduce the above copyright notice,
10  
-      this list of conditions and the following disclaimer in the documentation
11  
-      and/or other materials provided with the distribution.
12  
-    * Neither the name of iMemories nor the names of its contributors may be
13  
-      used to endorse or promote products derived from this software without
14  
-      specific prior written permission.
  7
+     http://www.apache.org/licenses/LICENSE-2.0
15 8
 
16  
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
17  
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
18  
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
19  
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
20  
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
21  
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
22  
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
23  
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
24  
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
25  
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  9
+   Unless required by applicable law or agreed to in writing, software
  10
+   distributed under the License is distributed on an "AS IS" BASIS,
  11
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12
+   See the License for the specific language governing permissions and
  13
+   limitations under the License.
2  README
... ...
@@ -1,4 +1,4 @@
1  
-License: http://www.opensource.org/licenses/bsd-license.php
  1
+http://www.opensource.org/licenses/apache2.0.php
2 2
 
3 3
 Cassandra Version: 0.5.1
4 4
 Hector Version: 0.5.0-6

0 notes on commit fa5e690

Please sign in to comment.
Something went wrong with that request. Please try again.