diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:35:09 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:35:09 +0100 |
commit | fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf (patch) | |
tree | 7347b2b968591f0c3e37b319fdd6ca9fe4ea5b3f /plugins/immark | |
parent | cc0da38a4becfd5a152438823437f671234e3a3b (diff) | |
parent | 0871d0a077c8adfdda8f055e021239dc4f354f7e (diff) | |
download | rsyslog-fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf.tar.gz rsyslog-fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf.tar.xz rsyslog-fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf.zip |
Merge branch 'v5-stable' into v6-stable
Conflicts:
plugins/imtcp/imtcp.c
Diffstat (limited to 'plugins/immark')
-rw-r--r-- | plugins/immark/immark.c | 29 | ||||
-rw-r--r-- | plugins/immark/immark.h | 29 |
2 files changed, 28 insertions, 30 deletions
diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c index 37924a38..b52d8f2e 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" diff --git a/plugins/immark/immark.h b/plugins/immark/immark.h index db98978b..977d63b3 100644 --- a/plugins/immark/immark.h +++ b/plugins/immark/immark.h @@ -4,24 +4,23 @@ * * File begun on 2007-12-12 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. */ #ifndef IMMARK_H_INCLUDED #define IMMARK_H_INCLUDED 1 |