Commit Graph

84067 Commits

Author SHA1 Message Date
Ch3LL
8089a885c2
add wipe function to other run_ssh method 2017-11-10 10:48:31 -05:00
Ch3LL
200b12ae6a
change versionadded salt version 2017-11-10 10:48:31 -05:00
Ch3LL
e3ebb5e9b3
fix comment and variables 2017-11-10 10:48:30 -05:00
Ch3LL
faef0886a7
Add state tests and state request system to salt-ssh 2017-11-10 10:48:30 -05:00
Nicole Thomas
4f3a79df07
Merge pull request #44467 from twangboy/win_fix_test_doc
Fix `unit.test_doc` for Windows
2017-11-10 08:21:57 -07:00
twangboy
0a9e862bf4
Use regex to split 2017-11-09 16:24:19 -07:00
Gareth J. Greenaway
ff4f13877f
Merge pull request #44443 from Ch3LL/ssh_grains
Add salt-ssh grains.items test
2017-11-08 17:42:10 -07:00
Ch3LL
5d1a9af4b5
Add salt-ssh grains.items test 2017-11-08 13:41:11 -05:00
Nicole Thomas
dcdf2d4c90
Merge pull request #44429 from Ch3LL/orch_doc
Fix orch doc from pillat.get to pillar.get
2017-11-07 16:06:38 -07:00
Ch3LL
38ca5520f0
Fix orch doc from pillat.get to pillar.get 2017-11-07 11:36:10 -05:00
Nicole Thomas
62c4addef8
Merge pull request #43817 from The-Loeki/orch-pillarenv
Orchestrate runner forces pillarenv and saltenv to None
2017-11-06 23:00:15 -07:00
Mike Place
9e4708b7b9
Merge pull request #44408 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-11-06 08:52:59 -07:00
rallytime
edbbd5fc2b
Merge branch '2016.11' into '2017.7'
Conflicts:
  - .kitchen.yml
  - salt/modules/win_system.py
2017-11-05 20:56:44 -07:00
Mike Place
b11da0d2da
Merge pull request #44358 from The-Loeki/kube-client-cert-file
Kubernetes client certificate file usage fix
2017-11-03 15:51:27 -06:00
Mike Place
1974e52c06
Merge pull request #44347 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-11-03 15:48:20 -06:00
Nicole Thomas
5e289f42ba
Merge pull request #44383 from gtmanfred/2016kitchen
switch salt-jenkins over to saltstack for kitchen-salt tests
2017-11-03 13:56:47 -06:00
Daniel Wallace
b65f4ea4ea
switch salt-jenkins over to saltstack 2017-11-02 10:29:45 -06:00
Nicole Thomas
aea9f4a115
Merge pull request #44364 from Ch3LL/fix_size_test
Include disk size check for test_spm_build_big_file test
2017-11-01 09:57:24 -04:00
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test 2017-10-31 18:18:37 -04: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
609de9367a
Merge pull request #44273 from DSRCorporation/bugs/44239_syndic_progress
Workaround progressbar failure if minion is behind syndic.
2017-10-31 11:07:16 -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
Ronald van Zantvoort
35a8b0bb38 Kubernetes client certificate file usage fix 2017-10-31 15:54:24 +01: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
eef6dbfa58
Merge pull request #44350 from gtmanfred/2017.7
update salt-jenkins repo to 2017.7
2017-10-30 17:31:29 -04:00
Daniel Wallace
cf71e3d9f2
update salt-jenkins repo to 2017.7 2017-10-30 15:29:00 -06:00
rallytime
9bad04b94b
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/archive.py
2017-10-30 17:05:02 -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
Nicole Thomas
d586b3bf97
Merge pull request #44346 from gtmanfred/2017.7
remove binding from erb template rendering (2017.7)
2017-10-30 16:57:18 -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
Daniel Wallace
bf577c3d8b
remove binding
With binding, the rendered template is not returned to stdout (into the template).
2017-10-30 14:46:15 -06:00
Nicole Thomas
547aac6658
Merge pull request #44343 from gtmanfred/2017.7
render template files platforms.yml and driver.yml (2017.7)
2017-10-30 16:04:21 -04: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
ec24fbc0c2
render template files platforms.yml and driver.yml 2017-10-30 13:53:51 -06: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
Nicole Thomas
6e2a74c18b
Merge pull request #44338 from corywright/issue-44336-fix-archive-tar-docs-2017-7-and-newer
Remove leading dash from options in archive.tar docs (2017.7 and develop)
2017-10-30 14:59:32 -04:00
Cory Wright
9c1c35a59f
Remove leading dash (-) from options in archive.tar documentation 2017-10-30 10:43:35 -06:00
Cory Wright
49b0abc284
Remove leading dash (-) from options in archive.tar documentation 2017-10-30 10:28:31 -06:00
Rossen Georgiev
b18f2e5a6d fix program name and description for --static 2017-10-30 15:10:11 +00:00
Nicole Thomas
71923bed97
Merge pull request #44265 from Ch3LL/service_test
Add service.status integration test
2017-10-30 11:00:11 -04:00
Nicole Thomas
8ae9769bfb
Merge pull request #44294 from eyj/boto_asg
Boto asg fixes, Backport of #43858
2017-10-30 10:48:51 -04:00
Nicole Thomas
68a9bebf90
Merge pull request #44312 from rallytime/bp-44287
Back-port #44287 to 2017.7
2017-10-30 10:25:55 -04:00
Nicole Thomas
b8854e27c0
Merge pull request #44311 from rallytime/bp-44262
Back-port #44262 to 2017.7
2017-10-30 10:25:34 -04:00
Nicole Thomas
48df79ef77
Merge pull request #44314 from gtmanfred/2017.7
update .kitchen.yml to run py3 tests too
2017-10-30 10:23:15 -04:00
Nicole Thomas
716aabc0bf
Merge branch '2017.7' into service_test 2017-10-29 11:32:33 -04:00
Rossen Georgiev
5b10918f02 updated CLI docs for salt-ssh 2017-10-28 10:54:47 +01:00
Daniel Wallace
54265769c4
Merge branch '2017.7' into 2017.7 2017-10-27 14:12:06 -06:00
Ch3LL
dd5c823210
remove skipIf import 2017-10-27 15:01:32 -04:00
Nicole Thomas
4d02e61f97
Merge branch '2017.7' into bp-44287 2017-10-27 14:56:42 -04:00