Permalink
Browse files

Updated license

  • Loading branch information...
wolpert committed Mar 12, 2010
1 parent 66c0599 commit fa5e6908c2739b8d3aad540d5ba4a65b083810b7
Showing with 11 additions and 23 deletions.
  1. +10 −22 LICENSE.txt
  2. +1 −1 README
View
@@ -1,25 +1,13 @@
Copyright (c) 2010, Ned Wolpert <ned.wolpert@imemories.com>
All rights reserved.
Copyright 2010 Ned Wolpert <ned.wolpert@imemories.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
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
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* 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.
* Neither the name of iMemories nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.
http://www.apache.org/licenses/LICENSE-2.0
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 HOLDER 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.
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.
View
2 README
@@ -1,4 +1,4 @@
License: http://www.opensource.org/licenses/bsd-license.php
http://www.opensource.org/licenses/apache2.0.php
Cassandra Version: 0.5.1
Hector Version: 0.5.0-6

0 comments on commit fa5e690

Please sign in to comment.