[Reconnoiter-devel] [reconnoiter commit] r1133 - in trunk: . src/modules

svn-commit at lists.omniti.com svn-commit at lists.omniti.com
Thu Dec 17 17:33:57 EST 2009


Author: jesus
Date: 2009-12-17 17:33:57 -0500 (Thu, 17 Dec 2009)
New Revision: 1133

Modified:
   trunk/LICENSE
   trunk/src/modules/collectd.c
Log:
correct the license -- hoping this doesn't cause a problem for Dan, fixes #222

Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE	2009-12-03 14:00:47 UTC (rev 1132)
+++ trunk/LICENSE	2009-12-17 22:33:57 UTC (rev 1133)
@@ -38,9 +38,20 @@
 
 jlog: new-BSD style (no advert)
 noitedit: (libedit: new-BSD w/advert)
+eventer: new-BSD
 serf: Apache-2.0
 lua: MIT
 libudns: LGPL
+collectd: LGPL
 esper: GPLv2
 activemq: Apache-2.0
 reconnoiter.jar: GPLv2
+
+ *    "This product includes software developed by the OpenEvidence Project
+ *    for use in the OpenEvidence Toolkit (http://www.openevidence.org/)
+ *    This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *    This product includes cryptographic software written by Eric Young
+ *    (eay at cryptsoft.com).  This product includes software written by Tim
+ *    Hudson (tjh at cryptsoft.com)."
+

Modified: trunk/src/modules/collectd.c
===================================================================
--- trunk/src/modules/collectd.c	2009-12-03 14:00:47 UTC (rev 1132)
+++ trunk/src/modules/collectd.c	2009-12-17 22:33:57 UTC (rev 1133)
@@ -1,33 +1,24 @@
 /*
- * Copyright (c) 2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2009  Florian Forster
+ * Copyright (c) 2009, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2009, Dan Di Spaltro
  * 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 OmniTI Computer Consulting, Inc. 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.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library, in file named COPYING.LGPL; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA  02111-1307  USA
+ *
  */
 
 #include "noit_defines.h"



More information about the Reconnoiter-devel mailing list