twangboy
|
fd47b21530
|
Fix merge conflict
|
2018-04-26 22:32:38 -06:00 |
|
Daniel Wozniak
|
dac04261b5
|
Merge pull request #47342 from dwoz/test_mysql_fix
Fix mysql test cases
|
2018-04-26 17:50:52 -07:00 |
|
Daniel Wozniak
|
34e78ef564
|
Merge pull request #47341 from dwoz/inet_pton_fix
Fix python 3 support for inet_pton function
|
2018-04-26 16:35:44 -07:00 |
|
Daniel A. Wozniak
|
7496f4c5a8
|
Fix mysql test cases
|
2018-04-26 15:42:46 -07:00 |
|
Daniel Wozniak
|
e4779f3246
|
Merge pull request #47339 from dwoz/ssh_key_test_fix
Use salt.utils.fopen for line ending consistancy
|
2018-04-26 15:39:55 -07:00 |
|
Ch3LL
|
d58be06751
|
Add additionatl service module integration tests and enable for windows
|
2018-04-26 18:13:20 -04:00 |
|
Daniel Wozniak
|
b221860151
|
Merge pull request #47335 from dwoz/pip_test_fix
Remove un-needed string-escape
|
2018-04-26 14:49:26 -07:00 |
|
Daniel A. Wozniak
|
85451f48d4
|
Fix python 3 support for inet_pton function
|
2018-04-26 14:03:54 -07:00 |
|
Daniel A. Wozniak
|
e37a93a1ca
|
Remove redundent close call
|
2018-04-26 13:47:11 -07:00 |
|
Daniel Wozniak
|
1c527bfd3a
|
Merge pull request #47331 from dwoz/py3_wingroup_fix
Do not encode usernames
|
2018-04-26 12:57:27 -07:00 |
|
Daniel A. Wozniak
|
b2ae5889b7
|
Close the temporary file handle
|
2018-04-26 12:52:08 -07:00 |
|
Daniel A. Wozniak
|
9f7f83a975
|
Use salt.utils.fopen for line ending consistancy
|
2018-04-26 12:43:51 -07:00 |
|
Daniel A. Wozniak
|
dcb6a22c00
|
Remove un-needed string-escape
|
2018-04-26 11:28:25 -07:00 |
|
Erik Johnson
|
65c3ba7ff1
|
Remove useless documentation
The private funcs aren't parsed by RST autosummary so telling someone to
view them is not helpful
|
2018-04-26 12:01:22 -05:00 |
|
Erik Johnson
|
5d67cb27de
|
Remove unncessary commented line
|
2018-04-26 12:00:40 -05:00 |
|
Daniel A. Wozniak
|
cc154ef857
|
Do not encode usernames
|
2018-04-26 09:53:56 -07:00 |
|
Mike Place
|
708078b152
|
Merge pull request #47329 from cachedout/frank_credit
Credit Frank Spierings
|
2018-04-26 11:37:58 -05:00 |
|
Mike Place
|
33c0644ac4
|
Credit Frank Spierings
|
2018-04-26 11:29:51 -05:00 |
|
Nicole Thomas
|
a545e55543
|
Merge pull request #47281 from Ch3LL/system_test
Add win_system integration module tests
|
2018-04-26 12:07:40 -04:00 |
|
Nicole Thomas
|
b64d930df0
|
Merge pull request #47283 from Ch3LL/ntp_test
Add windows ntp integration module tests
|
2018-04-26 12:04:43 -04:00 |
|
Nicole Thomas
|
910aff910f
|
Merge pull request #47314 from Ch3LL/net_mac_test
Skip netstat test on macosx as its not supported
|
2018-04-26 12:00:36 -04:00 |
|
Nicole Thomas
|
0549ef7c16
|
Merge pull request #47307 from rallytime/bp-47257
Back-port #47257 to 2017.7
|
2018-04-26 11:16:22 -04:00 |
|
Nicole Thomas
|
d6ff4689f6
|
Merge pull request #47312 from rallytime/update-bootstrap-release
Update bootstrap script to latest release: 2018.04.25
|
2018-04-26 11:15:12 -04:00 |
|
Daniel A. Wozniak
|
d4ae787595
|
Do not join a thread that is stopped
Remove the need for exception handling by not raising exceptions in the
first place.
|
2018-04-25 14:26:25 -07:00 |
|
Mike Place
|
e0765f5719
|
Merge pull request #47279 from dwoz/py3_build_fix
Gracefully shutdown worker threads
|
2018-04-25 16:15:42 -05:00 |
|
Ch3LL
|
67beb1451c
|
Skip netstat test on macosx as its not supported
|
2018-04-25 16:44:28 -04:00 |
|
rallytime
|
765cce06a2
|
Update bootstrap script to latest release: 2018.04.25
|
2018-04-25 15:44:50 -04:00 |
|
Ch3LL
|
4e16c18c16
|
Add firewall module windows tests to whitelist
|
2018-04-25 15:26:45 -04:00 |
|
Ch3LL
|
4b2fc4ec66
|
Add windows firewall execution modules integration tests
|
2018-04-25 15:25:55 -04:00 |
|
Jeroen Nijhof
|
6c5b2f92bc
|
Role is not a list but a dictionary
|
2018-04-25 14:06:28 -04:00 |
|
Nicole Thomas
|
44f19b2f94
|
Merge pull request #47113 from jfindlay/iptables_state
Support proto for IPSec policy extension in iptables state
|
2018-04-25 14:01:18 -04:00 |
|
Nicole Thomas
|
b7a6206330
|
Merge pull request #47302 from Ch3LL/dead_code
Remove unnecessary code from core grains and add test
|
2018-04-25 13:58:47 -04:00 |
|
Nicole Thomas
|
e29362acfc
|
Merge pull request #47303 from baniobloom/bug_fix_doc
Added clarity on oldest supported main release branch
|
2018-04-25 13:52:38 -04:00 |
|
Daniel A. Wozniak
|
21dc1bab91
|
Pep-8 line endings
|
2018-04-25 09:20:26 -07:00 |
|
Mike Place
|
85025af83c
|
Pass timeout to salt CLI for tests
This should hopefully fix up the race condition in the long-running
jobs test.
|
2018-04-25 11:04:59 -05:00 |
|
Banio Carpenter
|
b97c9df5f3
|
added clarity on how to figure out what is the oldest supported main release branch
|
2018-04-25 10:59:22 -05:00 |
|
Nicole Thomas
|
0d9d55e013
|
Merge pull request #47106 from DSRCorporation/bugs/tornado50
Tornado50 compatibility fixes
|
2018-04-25 11:32:36 -04:00 |
|
Daniel A. Wozniak
|
717abedaf7
|
Fix comman wart
|
2018-04-25 08:31:07 -07:00 |
|
Ch3LL
|
daa68b4877
|
Add virtual grains test for core grains
|
2018-04-25 11:03:35 -04:00 |
|
Nicole Thomas
|
2e014f4746
|
Merge pull request #47271 from gtmanfred/amazon
load rh_service for amazon linux not booted with systemd
|
2018-04-25 10:47:05 -04:00 |
|
Nicole Thomas
|
599b0ed1e9
|
Merge pull request #47246 from cloudflare/fix-44847-2017.7
Attempting to fix #44847: allow a different way to get the test and debug flags into the netconfig state
|
2018-04-25 10:44:01 -04:00 |
|
Nicole Thomas
|
4e2e1f0719
|
Merge pull request #47220 from benediktwerner/fix-pip-2017.7
Fix pip.installed when no changes occurred with pip >= 1.0.0
|
2018-04-25 10:23:49 -04:00 |
|
Ch3LL
|
a59dd2785d
|
Remove dead code in core grains file for virt-what
|
2018-04-25 10:22:56 -04:00 |
|
Nicole Thomas
|
92e606251f
|
Merge pull request #47272 from rallytime/reg-windows-codeowners
Add windows tests and reg module/state to CODEOWNERS file for team-windows
|
2018-04-25 09:25:28 -04:00 |
|
Daniel A Wozniak
|
4100dcd64c
|
Close might get called more than once
Since close can be called more than once handle and log exceptions
|
2018-04-24 23:52:13 -07:00 |
|
Daniel A Wozniak
|
dbe671f943
|
Stop socket before queue on delete
|
2018-04-24 19:24:03 -07:00 |
|
Daniel A. Wozniak
|
9587f5c69e
|
Silence pylint import-error for six.moves
|
2018-04-24 17:21:30 -07:00 |
|
Daniel A. Wozniak
|
4b0c7d3b34
|
Fix typo
|
2018-04-24 16:17:14 -07:00 |
|
Daniel A. Wozniak
|
05adf7c2b1
|
Use six.moves for queue import
|
2018-04-24 15:18:36 -07:00 |
|
Banio Carpenter
|
8de3d41adb
|
fixed vpc_peering_connection_name option
|
2018-04-24 14:58:09 -05:00 |
|