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
af1b460c6d
Merge pull request #43703 from rallytime/publish_refactor_use_check_authentication
...
Refactor publish func in master/masterapi to use check_authentication
2017-10-30 17:32:14 -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
Daniel Wallace
947bb86695
comment wordpress module
2017-10-30 13:34:28 -06:00
Daniel Wallace
2659b8b03e
remove pypi.c7 from tests
2017-10-30 13:05:35 -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
skjaro
811dc55de4
Fix check multiple entries with subtypes separated with comma
2017-10-30 17:06:48 +01:00
Rossen Georgiev
b18f2e5a6d
fix program name and description for --static
2017-10-30 15:10:11 +00:00
Nicole Thomas
835e6714ae
Merge branch 'develop' into publish_refactor_use_check_authentication
2017-10-30 11:06:59 -04: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
7728045649
Merge pull request #44300 from jf/add-prepend_path-to-cmd.run
...
Add `prepend_path` option to `cmd.run`
2017-10-30 10:48:26 -04:00
Nicole Thomas
470678d881
Merge pull request #44308 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 15
2017-10-30 10:26:26 -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
7d1111660d
Merge pull request #44318 from zhihan/patch-1
...
Typo, close the parenthesis.
2017-10-30 10:12:29 -04:00
rallytime
0574df20ce
Add some clarifications to event and architecture documentation
2017-10-29 15:08:57 -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
Zhi Han
b92d303756
Typo, close the parenthesis.
2017-10-27 15:39:28 -04: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
Nicole Thomas
72d617cfbe
Merge branch '2017.7' into bp-44262
2017-10-27 14:36:40 -04:00
Nicole Thomas
dbc5e224e9
Merge pull request #44316 from rallytime/fix-lint
...
Fix lint failure on 2017.7 branch
2017-10-27 14:36:08 -04:00
rallytime
6d2490f6a0
Fix lint failure on 2017.7 branch
2017-10-27 13:03:01 -04:00
Nicole Thomas
9fc7fde8d2
Merge pull request #43885 from garethgreenaway/43825_swap_total_grain
...
[develop] Adding swap_total to core grains
2017-10-27 13:01:11 -04:00
Daniel Wallace
39262b625e
update .kitchen.yml to run py3 tests too
2017-10-27 10:31:45 -06:00
Jeffrey 'jf' Lim
f59271f172
tweak prepend_path join code
2017-10-28 00:18:29 +08:00
Nicole Thomas
b2b0c770a4
Merge pull request #44279 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-27 12:17:18 -04:00
Jeffrey 'jf' Lim
ba0eaae95e
Fix utils.files.guess_archive_type to recognize the "tbz" extension as well
...
(also tidy up list of extensions)
2017-10-27 12:15:41 -04:00
Ollie Armstrong
ae34a15503
docker_container.running sort list of links
...
When the docker_container.running module is comparing the defined state
and the current state of a container, the list of linked containers in
the current state is is a non-deterministic order. This results in a
container recreation even though the links are the same (just in a
different order).
This patches the comparison function to lexically sort both the existing
and desired list of links, making the comparison deterministic and not
recreating a container when the links have not changed.
Fixes #44258 .
2017-10-27 12:14:16 -04:00
Jeffrey 'jf' Lim
6bd8aea8cf
cmdmod: shift new prepend_path argument to the end to avoid breaking any positional argument calls
2017-10-28 00:02:17 +08:00
Jeffrey 'jf' Lim
bbdcaee250
tag prepend_path option with '.. versionadded:: Oxygen'
2017-10-27 23:37:06 +08:00
Erik Johnson
340a07b62f
Merge pull request #44262 from oarmstrong/develop
...
docker_container.running sort list of links
2017-10-27 10:20:23 -05:00
Erik Johnson
bd5b9dd0aa
Merge pull request #44291 from Ch3LL/pillar_test
...
add saltutil.refresh_pillar test
2017-10-27 10:19:42 -05:00
