incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From afu...@apache.org
Subject svn commit: r1209529 - in /incubator/accumulo/trunk: ./ LICENSE
Date Fri, 02 Dec 2011 15:28:41 GMT
Author: afuchs
Date: Fri Dec  2 15:28:41 2011
New Revision: 1209529

URL: http://svn.apache.org/viewvc?rev=1209529&view=rev
Log:
ACCUMULO-204

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/LICENSE

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 15:28:41 2011
@@ -1,2 +1,2 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124
-/incubator/accumulo/branches/1.4:1201902-1209288
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526
+/incubator/accumulo/branches/1.4:1201902-1209288,1209528

Modified: incubator/accumulo/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/LICENSE?rev=1209529&r1=1209528&r2=1209529&view=diff
==============================================================================
--- incubator/accumulo/trunk/LICENSE (original)
+++ incubator/accumulo/trunk/LICENSE Fri Dec  2 15:28:41 2011
@@ -200,3 +200,72 @@
    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.
+
+
+APACHE ACCUMULO SUBCOMPONENTS:
+
+The Apache Accumulo project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses. 
+
+For the org.apache.accumulo.core.bloomfilter.* classes:
+
+    /**
+     *
+     * Copyright (c) 2005, European Commission project OneLab under contract
+     * 034819 (http://www.one-lab.org)
+     * 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 the University Catholique de Louvain - UCL
+     *    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.
+     */
+
+
+For the src/server/src/main/resources/web/flot/*.js files:
+
+    The MIT License
+
+    Copyright (c) 2008, Three Dub Media (threedubmedia@gmail.com)
+    Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net)
+    
+    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 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.
+



Mime
View raw message