Adjust deprecation removal for compat features

As discussed with @lippserd :)

refs #6032
refs #6033

diff --git a/doc/14-features.md b/doc/14-features.md
index 4ccbebb83356eb442589a5013a6d828cee4ade35..aa0206078fce2108d40cec36093d4fc73d9c35dc 100644 (file)
--- a/doc/14-features.md
+++ b/doc/14-features.md
@@ -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.

diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
index 0b14c7edb6b483a798ecac4678905a36da823c3e..5e6d2c752ae974c82c711bc02936fecbad27bccc 100644 (file)
--- a/lib/compat/compatlogger.cpp
+++ b/lib/compat/compatlogger.cpp
@@ -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));

diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index fa9d8a50c58e79eaaca9d417e6e7911ae855bef4..6b1610b0e050c6c59bf49ac01576bcc0de84e06e 100644 (file)
--- a/lib/compat/statusdatawriter.cpp
+++ b/lib/compat/statusdatawriter.cpp
@@ -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;