From 0ef57644cc7e2b3b320519ce8a530cb2c848242a Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 13 Jan 2010 06:48:50 +0000 Subject: [PATCH] HBASE-2119 Fix top-level NOTICES.txt file. Its stale. git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@898662 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + NOTICE.txt | 37 ------------------------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b26eaab8ec1..df084a59b45 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -155,6 +155,7 @@ Release 0.21.0 - Unreleased 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 diff --git a/NOTICE.txt b/NOTICE.txt index 9e7dd1df4e6..68cbf65bac3 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -3,43 +3,6 @@ Foundation (http://www.apache.org/). 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.