You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/12/05 20:45:42 UTC
svn commit: r1210593 - /incubator/accumulo/branches/1.4/LICENSE
Author: ecn
Date: Mon Dec 5 19:45:42 2011
New Revision: 1210593
URL: http://svn.apache.org/viewvc?rev=1210593&view=rev
Log:
ACCUMULO-86 fix up the LICENSE and NOTICE files
Modified:
incubator/accumulo/branches/1.4/LICENSE
Modified: incubator/accumulo/branches/1.4/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/LICENSE?rev=1210593&r1=1210592&r2=1210593&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/LICENSE (original)
+++ incubator/accumulo/branches/1.4/LICENSE Mon Dec 5 19:45:42 2011
@@ -273,3 +273,40 @@ For the src/server/src/main/resources/we
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+For the jline library:
+
+ The BSD License
+
+ Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+
+ 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 JLine 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.
+