Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A64C596EC for ; Fri, 2 Dec 2011 15:35:21 +0000 (UTC) Received: (qmail 23178 invoked by uid 500); 2 Dec 2011 15:35:21 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 23154 invoked by uid 500); 2 Dec 2011 15:35:21 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 23147 invoked by uid 99); 2 Dec 2011 15:35:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 15:35:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 15:35:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 655D723889E1; Fri, 2 Dec 2011 15:34:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209534 - in /incubator/accumulo/branches/1.3.5rc: ./ LICENSE Date: Fri, 02 Dec 2011 15:34:57 -0000 To: accumulo-commits@incubator.apache.org From: afuchs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202153457.655D723889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: afuchs Date: Fri Dec 2 15:34:56 2011 New Revision: 1209534 URL: http://svn.apache.org/viewvc?rev=1209534&view=rev Log: ACCUMULO-204 Modified: incubator/accumulo/branches/1.3.5rc/ (props changed) incubator/accumulo/branches/1.3.5rc/LICENSE Propchange: incubator/accumulo/branches/1.3.5rc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 2 15:34:56 2011 @@ -1 +1 @@ -/incubator/accumulo/branches/1.3:1209526 +/incubator/accumulo/branches/1.3:1209526,1209532 Modified: incubator/accumulo/branches/1.3.5rc/LICENSE URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/LICENSE?rev=1209534&r1=1209533&r2=1209534&view=diff ============================================================================== --- incubator/accumulo/branches/1.3.5rc/LICENSE (original) +++ incubator/accumulo/branches/1.3.5rc/LICENSE Fri Dec 2 15:34:56 2011 @@ -248,8 +248,12 @@ For the src/server/src/main/resources/we The MIT License - Copyright (c) 2008, Three Dub Media (threedubmedia@gmail.com) + Copyright (c) 2008, Three Dub Media (http://threedubmedia.com) Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net) + Copyright (c) 2010 "Cowboy" Ben Alman + Copyright 2011, John Resig + Copyright 2011, The Dojo Foundation + Copyright (c) 2007-2009 IOLA and Ole Laursen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal