Changeset ebebe4bf06f10ee391329b0818e050fd469abb9e

Show
Ignore:
Timestamp:
12/17/09 22:33:57 (4 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1261089237 +0000
git-parent:

[8135eaee0b0d6dfb4595c77c878f2a998a7303e1]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1261089237 +0000
Message:

correct the license -- hoping this doesn't cause a problem for Dan, fixes #222

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • LICENSE

    rb709393 rebebe4b  
    3939jlog: new-BSD style (no advert) 
    4040noitedit: (libedit: new-BSD w/advert) 
     41eventer: new-BSD 
    4142serf: Apache-2.0 
    4243lua: MIT 
    4344libudns: LGPL 
     45collectd: LGPL 
    4446esper: GPLv2 
    4547activemq: Apache-2.0 
    4648reconnoiter.jar: GPLv2 
     49 
     50 *    "This product includes software developed by the OpenEvidence Project 
     51 *    for use in the OpenEvidence Toolkit (http://www.openevidence.org/) 
     52 *    This product includes software developed by the OpenSSL Project 
     53 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)" 
     54 *    This product includes cryptographic software written by Eric Young 
     55 *    (eay@cryptsoft.com).  This product includes software written by Tim 
     56 *    Hudson (tjh@cryptsoft.com)." 
     57 
  • src/modules/collectd.c

    r5984f59 rebebe4b  
    11/* 
    2  * Copyright (c) 2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2009  Florian Forster 
     3 * Copyright (c) 2009, OmniTI Computer Consulting, Inc. 
     4 * Copyright (c) 2009, Dan Di Spaltro 
    35 * All rights reserved. 
    46 * 
    5  * Redistribution and use in source and binary forms, with or without 
    6  * modification, are permitted provided that the following conditions are 
    7  * met: 
    8  *  
    9  *     * Redistributions of source code must retain the above copyright 
    10  *       notice, this list of conditions and the following disclaimer. 
    11  *     * Redistributions in binary form must reproduce the above 
    12  *       copyright notice, this list of conditions and the following 
    13  *       disclaimer in the documentation and/or other materials provided 
    14  *       with the distribution. 
    15  *     * Neither the name OmniTI Computer Consulting, Inc. nor the names 
    16  *       of its contributors may be used to endorse or promote products 
    17  *       derived from this software without specific prior written 
    18  *       permission. 
    19  *  
    20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    21  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
    22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
    23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
    24  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
    25  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
    26  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
    27  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
    28  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    29  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
    30  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     7 * This library is free software; you can redistribute it and/or 
     8 * modify it under the terms of the GNU Lesser General Public 
     9 * License as published by the Free Software Foundation; either 
     10 * version 2.1 of the License, or (at your option) any later version. 
     11 * 
     12 * This library is distributed in the hope that it will be useful, 
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     15 * Lesser General Public License for more details. 
     16 * 
     17 * You should have received a copy of the GNU Lesser General Public 
     18 * License along with this library, in file named COPYING.LGPL; if not, 
     19 * write to the Free Software Foundation, Inc., 59 Temple Place, 
     20 * Suite 330, Boston, MA  02111-1307  USA 
     21 * 
    3122 */ 
    3223