diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:32:40 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:32:40 +0100 |
commit | 0871d0a077c8adfdda8f055e021239dc4f354f7e (patch) | |
tree | eb7d0a3ac4e5821b0ec8953717e49b838e062378 /plugins/immark/immark.c | |
parent | a357646ca124dbbf866606e8a48997154c40e205 (diff) | |
parent | e335a65788ccb9cd381dbd28982079a914f4ae4e (diff) | |
download | rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.tar.gz rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.tar.xz rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.zip |
Merge branch 'v4-stable' into v5-stable
Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c
Diffstat (limited to 'plugins/immark/immark.c')
-rw-r--r-- | plugins/immark/immark.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c index baac13a6..358b3b18 100644 --- a/plugins/immark/immark.c +++ b/plugins/immark/immark.c @@ -10,24 +10,23 @@ * of the "old" message code without any modifications. However, it * helps to have things at the right place one we go to the meat of it. * - * 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" |