tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6301 from Icinga/feature/deprecate-remove-compat-update 

Adjust deprecation removal for compat features
This commit is contained in:
Michael Friedrich 2018-05-14 16:04:32 +02:00 committed by GitHub
parent d0194b6331 119965fe24
commit ffcdf266c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/14-features.md
View File

@ -739,7 +739,7 @@ A detailed list on the available table attributes can be found in the [Livestatu
> **Note**
>
> This feature is DEPRECATED and will be removed in Icinga 2 v2.10.
> This feature is DEPRECATED and will be removed in Icinga 2 v2.11.
Icinga 1.x writes object configuration data and status data in a cyclic
interval to its `objects.cache` and `status.dat` files. Icinga 2 provides
@ -755,7 +755,7 @@ you can safely disable this feature.
> **Note**
>
> This feature is DEPRECATED and will be removed in Icinga 2 v2.10.
> This feature is DEPRECATED and will be removed in Icinga 2 v2.11.
The Icinga 1.x log format is considered being the `Compat Log`
in Icinga 2 provided with the `CompatLogger` object.

2
lib/compat/compatlogger.cpp
View File

@ -64,7 +64,7 @@ void CompatLogger::Start(bool runtimeCreated)
<< "'" << GetName() << "' started.";
Log(LogWarning, "CompatLogger")
<< "The CompatLogger feature is DEPRECATED and will be removed in Icinga v2.10.";
<< "The CompatLogger feature is DEPRECATED and will be removed in Icinga v2.11.";
Checkable::OnNewCheckResult.connect(std::bind(&CompatLogger::CheckResultHandler, this, _1, _2));
Checkable::OnNotificationSentToUser.connect(std::bind(&CompatLogger::NotificationSentHandler, this, _1, _2, _3, _4, _5, _6, _7, _8));

2
lib/compat/statusdatawriter.cpp
View File

@ -78,7 +78,7 @@ void StatusDataWriter::Start(bool runtimeCreated)
<< "'" << GetName() << "' started.";
Log(LogWarning, "StatusDataWriter")
<< "The StatusDataWriter feature is DEPRECATED and will be removed in Icinga v2.10.";
<< "The StatusDataWriter feature is DEPRECATED and will be removed in Icinga v2.11.";
m_ObjectsCacheOutdated = true;