Commit Graph

78170 Commits

Author SHA1 Message Date
Daniel Wallace
b65f4ea4ea
switch salt-jenkins over to saltstack 2017-11-02 10:29:45 -06:00
Mike Place
cab54e34b5
Merge pull request #44173 from twangboy/win_system_docs
Use google style docstrings in win_system.py
2017-10-31 11:56:33 -06:00
Mike Place
7aaea1d179
Merge pull request #44304 from jfindlay/cron_id
states.cron identifier defaults to name
2017-10-31 10:39:46 -06:00
Nicole Thomas
e4dbbde734
Merge pull request #44322 from rossengeorgiev/saltssh-docs-update
updated CLI docs for salt-ssh
2017-10-30 17:39:22 -04:00
Nicole Thomas
4e6f09e3eb
Merge pull request #44345 from gtmanfred/2016kitchen
remove binding from erb template rendering
2017-10-30 16:57:43 -04:00
Daniel Wallace
79b8b2d0bf
remove binding
With binding, the rendered template is not returned to stdout (into the template).
2017-10-30 14:46:42 -06:00
Nicole Thomas
209847c8c2
Merge pull request #44342 from gtmanfred/2016kitchen
render template files platforms.yml and driver.yml
2017-10-30 16:03:59 -04:00
Daniel Wallace
c50508f0b7
render template files platforms.yml and driver.yml 2017-10-30 13:52:20 -06:00
Nicole Thomas
1be65224cb
Merge pull request #44339 from corywright/issue-44336-fix-archive-tar-docs-2016-11
Remove leading dash from options in archive.tar docs (2016.11)
2017-10-30 15:00:34 -04:00
Cory Wright
9c1c35a59f
Remove leading dash (-) from options in archive.tar documentation 2017-10-30 10:43:35 -06:00
Rossen Georgiev
b18f2e5a6d fix program name and description for --static 2017-10-30 15:10:11 +00:00
Rossen Georgiev
5b10918f02 updated CLI docs for salt-ssh 2017-10-28 10:54:47 +01:00
Nicole Thomas
bebc33daf5 Merge pull request #44295 from HeinleinSupport/issue44272
fixes issue #44272
2017-10-27 10:28:57 -04:00
Justin Findlay
cc038c5bec
states.cron identifier defaults to name 2017-10-26 14:24:39 -07:00
Robert Sander
f972715a45 fixes issue #44272
The method stop() in the state module win_service fails if the service has already been stopped.
2017-10-26 10:52:19 +02:00
Mike Place
e7ca9f8407 Merge pull request #44286 from gtmanfred/2016.11
use our git repo for kitchen-salt
2017-10-25 21:27:32 +02:00
Sean Jenkins
613d500876 Merge branch '2016.11' into issue-39901 2017-10-25 11:17:57 -06:00
Sean Jenkins
b97e8046ca
Utilize salt.utils.validate.net.* and _raise_error_iface 2017-10-25 11:16:27 -06:00
Daniel Wallace
193e715e37
use our git repo for kitchen-salt 2017-10-25 11:15:17 -06:00
Mike Place
8a1ea165af Merge pull request #44259 from gtmanfred/2016.11
begin switching in kitchen-salt for running the test suite
2017-10-25 15:30:34 +02:00
Mike Place
9d6bc8509b Merge pull request #44268 from twangboy/win_fix_lgpo_typo
Fix typo
2017-10-25 15:01:34 +02:00
Mike Place
0beb65a283 Merge pull request #44269 from terminalmage/fix-log-message
Fix log message in salt.utils.gitfs
2017-10-25 15:00:57 +02:00
Erik Johnson
bc9cd65496
Fix log message in salt.utils.gitfs
This needed to be using the config overlay function and not referencing
the attribute directly.
2017-10-24 17:36:29 -05:00
twangboy
a6a4c10a77
Fix typo 2017-10-24 15:35:40 -06:00
twangboy
8e111b413d
Fix some of the wording and grammer errors 2017-10-24 13:24:39 -06:00
twangboy
a12bc5ae41
Use google style docstrings 2017-10-24 13:24:38 -06:00
Daniel Wallace
56a3ad8f68
fix pylint comments 2017-10-24 12:18:27 -06:00
Daniel Wallace
4add666db1
add comment to Gemfile and move copyartifacts
moved copyartifacts.py to tests/support

Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt
2017-10-24 12:01:57 -06:00
Daniel Wallace
b4c8f7eb57
fix pylint 2017-10-24 10:44:25 -06:00
Daniel Wallace
392fd4f837
try newest salttesting 2017-10-24 09:23:46 -06:00
Daniel Wallace
79251287d0
add logging 2017-10-24 09:23:46 -06:00
Daniel Wallace
38963d5a82
use transport if not set in state_file 2017-10-24 09:23:46 -06:00
Daniel Wallace
10e309a64f
which vagrant should go to stderr 2017-10-24 09:23:46 -06:00
Daniel Wallace
9307564de0
fix output columns 2017-10-24 09:23:46 -06:00
Daniel Wallace
2da22f87e1
test opennebula 2017-10-24 09:23:46 -06:00
Daniel Wallace
9f38f16905
add opennebula to Gemfile 2017-10-24 09:23:46 -06:00
Daniel Wallace
7465f9b27a
add script for copying back artifacts 2017-10-24 09:23:46 -06:00
Daniel Wallace
255118cfd7
run tests with kitchen 2017-10-24 09:23:44 -06:00
Sean Jenkins
6818f3631d
Fixes #39901 for RH/CentOS 7 2017-10-24 09:16:19 -06:00
Nicole Thomas
304dd2529d Merge pull request #44160 from gtmanfred/directory
add changes to test return
2017-10-23 10:35:20 -04:00
Erik Johnson
e10395483d Merge pull request #44205 from rallytime/bp-44177
Back-port #44177 to 2016.11
2017-10-23 09:09:06 -05:00
Senthilkumar Eswaran
b9940f8521
Fixing default redis.host in documentation 2017-10-20 10:55:41 -04:00
Nicole Thomas
09ddfd0c08 Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes
Fixes to modules/debian_ip
2017-10-20 10:25:38 -04:00
Daniel Wallace
a7d3d668f4
missed removing changes in the next test 2017-10-20 08:11:44 -06:00
Damon Atkins
04d03ea6b8 Updated comment 2017-10-20 18:12:55 +11:00
Damon Atkins
1dd565e585 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes 2017-10-20 18:11:51 +11:00
Mike Place
9f9e936b52 Merge pull request #43830 from rallytime/bp-43644
Back-port #43644 to 2016.11
2017-10-19 17:57:50 -05:00
Mike Place
07db6a3d8b Merge pull request #43994 from oeuftete/fix-manage-runner-presence
Fix manage.present to show lost minions
2017-10-19 17:27:58 -05:00
Mike Place
a07537e258 Merge pull request #44188 from terminalmage/issue44150
yumpkg: Check pkgname instead of name to see if it is a kernel pkg
2017-10-19 17:20:34 -05:00
Mike Place
715edc0cea Merge pull request #44158 from rallytime/bp-44089
Back-port #44089 to 2016.11
2017-10-19 15:38:14 -05:00