mark deprecated data_timeout option as obsolete

Author: jsvd

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.0.0
+  - Mark deprecated :data_timeout option as obsolete
+
 ## 5.0.0
   - Changed the behaviour of the `host` field to contain the resolved peer hostname for a connection instead of its peer IP
   and moved the peer's IP to the new field `ip_address`

docs/index.asciidoc

@@ -94,15 +94,6 @@ input plugins.
 
  
 
-[id="plugins-{type}s-{plugin}-data_timeout"]
-===== `data_timeout`  (DEPRECATED)
-
-  * DEPRECATED WARNING: This configuration item is deprecated and may not be available in future versions.
-  * Value type is <<number,number>>
-  * Default value is `-1`
-
-
-
 [id="plugins-{type}s-{plugin}-host"]
 ===== `host` 
 

lib/logstash/inputs/tcp.rb

@@ -73,7 +73,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   # When mode is `client`, the port to connect to.
   config :port, :validate => :number, :required => true
 
-  config :data_timeout, :validate => :number, :default => -1, :deprecated => "This setting is not used by this plugin. It will be removed soon."
+  config :data_timeout, :validate => :number, :obsolete => "This setting is not used any more."
 
   # Mode to operate in. `server` listens for client connections,
   # `client` connects to a server.

version

@@ -1 +1 @@
-5.0.0
+6.0.0