commit 7dc4e4d479888655f23c630729dc226d90133d97
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Dec 21 13:14:38 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Dec 21 13:14:38 2018 +0000
tree 6fb1ccd96049a138b3b96426a9ea239a598c58d9
parent 80fa3186afa32587bbaf2d3413931cac3f137692
parent 4928869607b0fd4081e0dc4bc12a285793aeec2c

Merge "Change deprecation message for enforceState methods"

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 3d46bb3..93750ae 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -173,7 +173,7 @@
 def enforceStateWithExclude(saltId, target, state, excludedStates = "", output = true, failOnError = true, batch = null, optional = false, read_timeout=-1, retries=-1, queue=true, saltArgs=[]) {
 // Deprecated, convert state to use Map as input parameter
     def common = new com.mirantis.mk.Common()
-    common.infoMsg("This method is deprecated. Convert you method call to use Map as input parameter")
+    common.infoMsg("This method will be deprecated. Convert you method call to use Map as input parameter")
     // Convert to Map
     params = ['saltId': saltId, 'target': target, 'state': state, 'excludedStates': excludedStates, 'output': output,
                 'failOnError': failOnError, 'batch': batch, 'optional': optional, 'read_timeout': read_timeout,
@@ -223,7 +223,7 @@
 def enforceStateWithTest(saltId, target, state, testTargetMatcher = "", output = true, failOnError = true, batch = null, optional = false, read_timeout=-1, retries=-1, queue=true, saltArgs=[]) {
 // Deprecated, convert state to use Map as input parameter
     def common = new com.mirantis.mk.Common()
-    common.infoMsg("This method is deprecated. Convert you method call to use Map as input parameter")
+    common.infoMsg("This method will be deprecated. Convert you method call to use Map as input parameter")
     // Convert to Map
     params = ['saltId': saltId, 'target': target, 'state': state, 'testTargetMatcher': testTargetMatcher, 'output': output,
                 'failOnError': failOnError, 'batch': batch, 'optional': optional, 'read_timeout': read_timeout,
@@ -293,7 +293,7 @@
 def enforceState(saltId, target, state, output = true, failOnError = true, batch = null, optional = false, read_timeout=-1, retries=-1, queue=true, saltArgs = [], minionRestartWaitTimeout=10) {
 // Deprecated, convert state to use Map as input parameter
     def common = new com.mirantis.mk.Common()
-    common.infoMsg("This method is deprecated. Convert you method call to use Map as input parameter")
+    common.infoMsg("This method will be deprecated. Convert you method call to use Map as input parameter")
     // Convert to Map
     params = ['saltId': saltId, 'target': target, 'state': state, 'output': output,
                 'failOnError': failOnError, 'batch': batch, 'optional': optional, 'read_timeout': read_timeout,