svn commit: r898662 - in /hadoop/hbase/trunk: CHANGES.txt NOTICE.txt

[st...@apache.org]

Author: stack
Date: Wed Jan 13 06:48:50 2010
New Revision: 898662

URL: http://svn.apache.org/viewvc?rev=898662&view=rev
Log:
HBASE-2119 Fix top-level NOTICES.txt file. Its stale.

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/NOTICE.txt

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=898662&r1=898661&r2=898662&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Jan 13 06:48:50 2010
@@ -155,6 +155,7 @@
    HBASE-2115  ./hbase shell would not launch due to missing jruby dependency
                (Kay Kay via JD)
    HBASE-2101  KeyValueSortReducer collapses all values to last passed
+   HBASE-2119  Fix top-level NOTICES.txt file. Its stale.
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/NOTICE.txt?rev=898662&r1=898661&r2=898662&view=diff
==============================================================================
--- hadoop/hbase/trunk/NOTICE.txt (original)
+++ hadoop/hbase/trunk/NOTICE.txt Wed Jan 13 06:48:50 2010
@@ -3,43 +3,6 @@
 
 In addition, this product includes software developed by:
 
-
-European Commission project OneLab (http://www.one-lab.org)
-
-
 Facebook, Inc. (http://developers.facebook.com/thrift/ -- Page includes the Thrift Software License)
 
-
 JUnit (http://www.junit.org/)
-
-The JSON jar source is here: http://www.json.org/java/index.html
-
-Michael Gottesman developed AgileJSON.  Its source code is here:
-
- http://github.com/gottesmm/agile-json-2.0/tree/master
-
-It has this license at the head of the each source file:
-
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy
- * of this software and associated documentation files (the "Software"), to
- * deal
- * in the Software without restriction, including without limitation the
- * rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all
- * copies or substantial portions of the Software.
- *
- * The Software shall be used for Good, not Evil.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.