Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: accumulo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1210571 - in /incubator/accumulo/branches/1.3: ./
 LICENSE NOTICE
Date: Mon, 05 Dec 2011 18:57:00 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
Message-Id: <20111205185700.8C9CA238897F@eris.apache.org>

Author: ecn
Date: Mon Dec  5 18:57:00 2011
New Revision: 1210571

URL: http://svn.apache.org/viewvc?rev=1210571&view=rev
Log:
ACCUMULO-86: update LICENSE and NOTICE as recommended

Modified:
    incubator/accumulo/branches/1.3/   (props changed)
    incubator/accumulo/branches/1.3/LICENSE
    incubator/accumulo/branches/1.3/NOTICE

Propchange: incubator/accumulo/branches/1.3/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/accumulo/branches/1.4:1209531

Modified: incubator/accumulo/branches/1.3/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/LICENSE?rev=1210571&r1=1210570&r2=1210571&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/LICENSE (original)
+++ incubator/accumulo/branches/1.3/LICENSE Mon Dec  5 18:57:00 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 <mwp1@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.
+

Modified: incubator/accumulo/branches/1.3/NOTICE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/NOTICE?rev=1210571&r1=1210570&r2=1210571&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/NOTICE (original)
+++ incubator/accumulo/branches/1.3/NOTICE Mon Dec  5 18:57:00 2011
@@ -12,3 +12,9 @@ This product includes JLine (http://jlin
 under the BSD License.
 Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>, All rights 
 reserved.
+
+Files in src/core/src/main/java/org/apache/accumulo/core/bloomfilter
+derived from sources
+Copyright (c) 2005, European Commission project OneLab under contract
+034819 (http://www.one-lab.org)
+All rights reserved.