Nicole Thomas
698b04779e
Merge pull request #44995 from twangboy/win_fix_atomicfile
...
Fix `unit.modules.test_file` for Windows
2017-12-15 12:05:48 -05:00
Nicole Thomas
10de468f13
Merge pull request #45031 from terminalmage/fix-mysql-returner
...
Fix invalid exception class in mysql returner
2017-12-15 10:00:14 -05:00
Erik Johnson
f3bd12c27c
Fix invalid exception class in mysql returner
...
salt.exceptions.Salt does not exist
2017-12-14 23:13:56 -06:00
Frode Gundersen
48e6953e1f
fix_string_error
2017-12-14 22:40:59 +00:00
Nicole Thomas
2e1a57b9bc
Merge pull request #44968 from gtmanfred/http
...
fix http wait for state
2017-12-14 15:06:00 -05:00
Giandom
4526c158f1
added-highstate-output-to-slack-engine
2017-12-14 19:21:40 +01:00
Giandom
573a0a4143
added-highstate-output-to-slack-engine
2017-12-14 19:20:38 +01:00
Nicole Thomas
e9bbc23b11
Merge branch '2017.7' into libcloud_dns_fixes
2017-12-14 12:38:05 -05:00
Nicole Thomas
c4f0894689
Merge pull request #44900 from xuhcc/rbenv-ret-fix
...
Fix TypeError during rbenv ruby installation when rbenv is not found
2017-12-14 12:37:13 -05:00
Nicole Thomas
9a7406207f
Merge pull request #44972 from terminalmage/bp-44958
...
Backport #44958 to 2016.11 branch
2017-12-14 11:56:01 -05:00
twangboy
8316481944
Comment the salt import
2017-12-14 09:04:26 -07:00
twangboy
fe34f0c877
Set owner properly on Windows
2017-12-14 08:57:30 -07:00
Nicole Thomas
f0c2cf3cec
Merge pull request #44974 from twangboy/win_skip_test_parsers
...
Skip test_log_created on Windows
2017-12-14 08:59:24 -05:00
twangboy
40665d7b08
Skip test_log_created on Windows
2017-12-13 14:12:07 -07:00
Erik Johnson
a416bf0112
No need to manually do connect_pub, use listen=True in run_job
2017-12-13 14:28:15 -06:00
Erik Johnson
3ec004bd2e
Fix a race condition in manage runner
...
The runner was not connecting the client event listener to the event
bus. This meant that all events between the `client.run_job()` and when
`client.get_cli_event_returns()` began polling for events would be lost.
Before `get_cli_event_returns` (via LocalClient's `get_iter_returns`)
gets around to polling for events, it first checks to see if the job
cache has a record of the jid it's querying. When using a custom
returner for the job_cache, one which has even a little bit of latency,
return events from minions may sneak past before the jid lookup is
complete, meaning that `get_iter_returns` will not return them and the
manage runner will assume the minion did not respond.
Connecting to the event bus before we run the test.ping ensures that we
do not miss any of these events.
2017-12-13 14:27:30 -06:00
rallytime
a0d2dd2069
Lint fix
2017-12-13 14:06:11 -05:00
rallytime
b2c8057427
Update bootstrap script to latest release: 2017.12.13
2017-12-13 13:24:10 -05:00
Arthur Deschamps
5c4bee43dc
correct accept_vpc_peering_connection
2017-12-13 13:13:12 -05:00
Daniel Wallace
ca6936f6eb
fix http wait for state
2017-12-13 11:06:34 -07:00
Daniel Wallace
5be463bb46
Merge branch '2017.7' into fix-bug-vault-empty-policy
2017-12-13 09:52:19 -07:00
Daniel Wallace
a5d8a6340e
check if VALUE is a string_type
...
key should always be a stringtype, we want to exclude booleans in the value.
2017-12-13 09:44:36 -07:00
Ryan Allphin
48d9cc3674
Fix bug with vault runner creating token on empty policy
2017-12-13 09:41:30 -07:00
Giandom
9a6e03ce6e
added-highstate-output-to-slack-engine
2017-12-13 17:40:08 +01:00
Mike Place
dad2d723ca
Merge pull request #44958 from terminalmage/issue44820
...
Fix a race condition in manage runner
2017-12-13 08:20:35 -07:00
Nicole Thomas
db58345abb
Merge pull request #44956 from terminalmage/fix-get_pidfile
...
Avoid traceback when bogus value in pidfile
2017-12-13 09:30:11 -05:00
Erik Johnson
ef749abfc6
No need to manually do connect_pub, use listen=True in run_job
2017-12-13 03:05:57 -06:00
Erik Johnson
2ac70cfab5
Fix a race condition in manage runner
...
The runner was not connecting the client event listener to the event
bus. This meant that all events between the `client.run_job()` and when
`client.get_cli_event_returns()` began polling for events would be lost.
Before `get_cli_event_returns` (via LocalClient's `get_iter_returns`)
gets around to polling for events, it first checks to see if the job
cache has a record of the jid it's querying. When using a custom
returner for the job_cache, one which has even a little bit of latency,
return events from minions may sneak past before the jid lookup is
complete, meaning that `get_iter_returns` will not return them and the
manage runner will assume the minion did not respond.
Connecting to the event bus before we run the test.ping ensures that we
do not miss any of these events.
2017-12-13 03:05:57 -06:00
Erik Johnson
d66f3a98d7
Avoid traceback when bogus value in pidfile
2017-12-12 17:10:47 -06:00
Nicole Thomas
e8e3b3c8ff
Merge pull request #44945 from gtmanfred/2017.7
...
Fix handling of effective acls
2017-12-12 16:49:33 -05:00
Nicole Thomas
47dc7b7afb
Merge pull request #44942 from rallytime/readme-saltconf-update
...
Update README with SaltConf18 info
2017-12-12 16:47:23 -05:00
Nicole Thomas
1032ca3290
Merge pull request #44385 from gtmanfred/schedule
...
schedule should be a dict in opts
2017-12-12 15:44:01 -05:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/grains/test_core.py
2017-12-12 15:24:30 -05:00
Nicole Thomas
7572982419
Merge pull request #44943 from mvivaldi/filters-doc
...
Fix for the jinja documentation
2017-12-12 15:20:40 -05:00
Nicole Thomas
465cacad83
Merge pull request #44832 from damon-atkins/2017.7_replace_with_newer_2016.11_win_pkg
...
win_pkg: Merge full copy of 2016.11 with many fixes and improvements to 2017.7
2017-12-12 13:30:05 -05:00
Daniel Wallace
66bb755751
add test for effective acls
2017-12-12 09:58:08 -07:00
Daniel Wallace
0ff52a93dd
use last entry in acl
...
This will allow for `effective` permissions to be looked at when the package
manager updates the system.
```
$ getfacl httpd/
user::rwx
group::---
group:webmaster:r-x #effective:---
mask::---
other::---
```
Fixes #44932
2017-12-12 09:54:06 -07:00
mvivaldi
d23ac4eabc
Fix for the jinja documentation
2017-12-12 17:35:46 +01:00
rallytime
d1317c44e2
Update README with SaltConf18 info
...
Previously we had information for SaltConf16, which is out of date.
2017-12-12 11:32:34 -05:00
Nicole Thomas
a811a92b17
Merge pull request #44754 from twangboy/win_fix_inet_pton
...
Fix inet_pton for Windows on Py3
2017-12-12 09:04:19 -05:00
Nicole Thomas
53b34e24cd
Merge pull request #44931 from pkruk/fix-missing-parenthis
...
add missing parenthis to keep integration with python3
2017-12-12 08:49:38 -05:00
Piotr
b1ed739b44
Merge branch '2017.7' into fix-missing-parenthis
2017-12-12 09:57:05 +01:00
Ronald van Zantvoort
ad55e33f57
libcloud_dns: fix state output
2017-12-12 08:39:50 +01:00
Ronald van Zantvoort
a68d594e3a
libcloud_dns: copy args before deleting from them
2017-12-12 08:33:00 +01:00
Nicole Thomas
25a20109fe
Merge branch '2017.7' into win_fix_inet_pton
2017-12-11 16:44:40 -05:00
Nicole Thomas
ba6146250a
Merge pull request #44891 from twangboy/win_fix_verify
...
Fix issue with unsafe path in Windows jenkins tests
2017-12-11 16:10:42 -05:00
Piotr Kruk
4f1b1f12d2
Merge branch 'fix-missing-parenthis' of https://github.com/pkruk/salt into fix-missing-parenthis
2017-12-11 21:48:51 +01:00
Piotr Kruk
adf38cacfb
add missing parenthis to keep integration with python3
2017-12-11 21:47:32 +01:00
Piotr Kruk
3475d3fa01
add missing parenthis to keep integration with python3
2017-12-11 21:37:00 +01:00
Frode Gundersen
c9fa4ed2a7
man_spm_test
2017-12-11 19:52:32 +00:00
