diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:25:45 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:25:45 +0100 |
commit | 29807bb3c918603f41eeaa2d15e89852a2657f9c (patch) | |
tree | 343c0856e562fac140eae3fabbb137ff39534fec /tools/syslogd.h | |
parent | 17ee19bb5c15c666422358a215c118791b2cce7a (diff) | |
parent | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (diff) | |
download | rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.gz rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.xz rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.zip |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
plugins/impstats/impstats.c
Diffstat (limited to 'tools/syslogd.h')
-rw-r--r-- | tools/syslogd.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tools/syslogd.h b/tools/syslogd.h index c3b99f9d..a3323d1f 100644 --- a/tools/syslogd.h +++ b/tools/syslogd.h @@ -1,22 +1,21 @@ /* common header for syslogd - * 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. */ #ifndef SYSLOGD_H_INCLUDED #define SYSLOGD_H_INCLUDED 1 |