diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-03 15:35:46 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-03 15:35:46 +0100 |
commit | f93fb89aef962f1799bc9f9c344a57ed33fb4747 (patch) | |
tree | 4dcbb5fabf7aabd08c5456aad9d97545c093e7c8 | |
parent | 8db83911e87573ff1f2035164032da6556ed68da (diff) | |
parent | 1b5fc33198de4f10dbbfadae5d31dcb90f383553 (diff) | |
download | rsyslog-f93fb89aef962f1799bc9f9c344a57ed33fb4747.tar.gz rsyslog-f93fb89aef962f1799bc9f9c344a57ed33fb4747.tar.xz rsyslog-f93fb89aef962f1799bc9f9c344a57ed33fb4747.zip |
Merge branch 'v5-stable' into v6-stable
-rw-r--r-- | plugins/ommysql/ommysql.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c index da1ab01c..41c8be65 100644 --- a/plugins/ommysql/ommysql.c +++ b/plugins/ommysql/ommysql.c @@ -6,24 +6,22 @@ * * File begun on 2007-07-20 by RGerhards (extracted from syslogd.c) * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Adiscon GmbH. * * This file is part of rsyslog. - * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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. */ #include "config.h" #include "rsyslog.h" |