| commit | 9a593d1dc14dbc40b1c0f89829d4479c25fb39a5 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@localhost> | Wed Feb 07 13:10:37 2018 +0000 |
| committer | Jenkins <jenkins@localhost> | Wed Feb 07 13:10:37 2018 +0000 |
| tree | fb27d1d1122b6fe5d4156527c1eb9ea02edf1ec5 | |
| parent | 0137adfdb4412301adb7438ffa517429421c4986 [diff] | |
| parent | b6cfc912bae49362d7cd836e309f0aa9f0822c07 [diff] |
Merge remote-tracking branch 'target/master'
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml index 646212b..d8f21ce 100644 --- a/jenkins/client/job/salt-formulas/tests.yml +++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -154,7 +154,8 @@ param: SALT_VERSION: type: string - default: "latest" + default: "" + description: "Version of salt for use in test, empty string means latest (default)" SALT_OPTS: type: string default: "--force-color"