From 36bef6a7a00f28bc6f7eac7fff315a2dadeb196b Mon Sep 17 00:00:00 2001 From: do3meli Date: Thu, 20 Oct 2016 11:43:03 +0200 Subject: [PATCH 1/2] use versionadded and deprecated warnings in apache_module --- salt/states/apache_module.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/states/apache_module.py b/salt/states/apache_module.py index 0d341e81c2..440ae86338 100644 --- a/salt/states/apache_module.py +++ b/salt/states/apache_module.py @@ -91,6 +91,8 @@ def disabled(name): ''' Ensure an Apache module is disabled. + .. versionadded:: 2016.3.0 + name Name of the Apache module ''' @@ -125,9 +127,7 @@ def disable(name): ''' Ensure an Apache module is disabled. - .. warning:: - - This function is deprecated and will be removed in Salt Nitrogen. + .. deprecated:: 2016.3.0 name Name of the Apache module From 659e229198495c081d090e9b94896182c67e768f Mon Sep 17 00:00:00 2001 From: do3meli Date: Thu, 20 Oct 2016 13:34:21 +0200 Subject: [PATCH 2/2] removed trailing whitespaces in apache_module.py --- salt/states/apache_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/states/apache_module.py b/salt/states/apache_module.py index 440ae86338..69ce10aa97 100644 --- a/salt/states/apache_module.py +++ b/salt/states/apache_module.py @@ -92,7 +92,7 @@ def disabled(name): Ensure an Apache module is disabled. .. versionadded:: 2016.3.0 - + name Name of the Apache module '''