Erik Johnson
3b449f11fc
Add regression test for excludes issue
2018-05-16 12:26:46 -05:00
rallytime
6c06cb3ae3
Merge branch '2017.7.6' into '2017.7'
...
No conflicts.
2018-05-16 12:46:26 -04:00
Nicole Thomas
990ece5cd5
Merge pull request #47665 from gtmanfred/cloud
...
use dictupdate to update the providers dictionary and merge lists
2018-05-16 11:59:16 -04:00
Nicole Thomas
16c2153385
Merge pull request #47667 from Ch3LL/mac_user_enable
...
Update test_mac_user_enable_auto_login to test both py2 and py3
2018-05-16 11:54:48 -04:00
Erik Johnson
28a7d2b81c
Skip __exclude__ in find_sls_ids
...
The corresponding value would be a list and thus raises a TypeError when
attempting to perform a dict lookup.
2018-05-16 10:11:31 -05:00
Nicole Thomas
a2ed8cbb7f
Merge pull request #47151 from zer0def/configparser-defaultsect
...
Allow interaction with default section in ConfigParser serializer
2018-05-16 09:53:43 -04:00
Nicole Thomas
e6fb8342ef
Merge pull request #47673 from terminalmage/bp-45808
...
Backport #45808 to 2017.7
2018-05-16 09:52:04 -04:00
andrei
454291ad62
Fix errors when attempting to cache files with long names or URLs
2018-05-15 22:39:09 -05:00
Daniel Wallace
b0446aab07
Merge pull request #47670 from gtmanfred/2017.7
...
add a pytest.ini and update a dependency for kitchen
2018-05-15 20:56:16 -05:00
Daniel Wallace
dfd5a8715f
add a pytest.ini and update a dependency for kitchen
2018-05-15 20:55:18 -05:00
Daniel Wallace
0d06da6944
Merge pull request #47626 from gtmanfred/2017.7
...
Implement Pipfile and remove extra requirements.txt files
2018-05-15 19:03:11 -05:00
Ch3LL
a8981024de
Add pkg.latest_version windows test
2018-05-15 16:20:55 -04:00
Ch3LL
ba40d3d1a1
Update test_mac_user_enable_auto_login to test both py2 and py3
2018-05-15 14:40:54 -04:00
Nicole Thomas
a07a8906a0
Merge pull request #47578 from Ch3LL/mac_service_disabled
...
Ensure mac_service.disabled is correctly querying services
2018-05-15 14:26:36 -04:00
Daniel Wallace
fd8a02decb
use dictupdate to update the providers dictionary and merge lists
2018-05-15 13:03:35 -05:00
Daniel Wallace
418364a533
make dev_python27.txt have the same message as dev_python34.txt
2018-05-15 12:29:52 -05:00
Nicole Thomas
a4921e86c9
Merge pull request #47645 from Ch3LL/py3_rm_pip
...
query the pip path for test test_issue_2087_missing_pip
2018-05-15 13:16:10 -04:00
Ch3LL
6032a01f55
change disable check for upstart service on ubuntu14
2018-05-15 12:07:27 -04:00
Nicole Thomas
a8f2ad977e
Merge branch '2017.7' into configparser-defaultsect
2018-05-15 10:50:09 -04:00
Nicole Thomas
e441733ac1
Merge pull request #47646 from rallytime/bp-47601-and-47643
...
Back-port #47601 and #47643 to 2017.7.6
2018-05-15 10:04:44 -04:00
Daniel A. Wozniak
9e1d1a5ef8
Fix typo
2018-05-14 15:49:36 -04:00
Daniel A. Wozniak
4e94609136
Remove unwanted file
2018-05-14 15:49:31 -04:00
Daniel A. Wozniak
0109249c78
use ignore-undefined-variable
2018-05-14 15:49:20 -04:00
Daniel A. Wozniak
37caecb7f4
Ignore pylint WindowsError
2018-05-14 15:49:15 -04:00
Daniel A. Wozniak
c1135d90c7
Better doc string
2018-05-14 15:49:08 -04:00
Daniel A. Wozniak
e53d6b9ed9
Skip tests when we can not use runas
2018-05-14 15:49:02 -04:00
Ch3LL
225d90ad4c
query the pip path for test test_issue_2087_missing_pip
2018-05-14 15:45:37 -04:00
Nicole Thomas
f63d801858
Merge pull request #47639 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.6 to 2017.7
2018-05-14 13:58:24 -04:00
Nicole Thomas
db0eef3e8b
Merge pull request #47643 from dwoz/runas_detect
...
Remove unwanted file
2018-05-14 13:53:56 -04:00
Daniel A. Wozniak
8c5e54b8b3
Fix typo
2018-05-14 10:30:04 -07:00
Daniel A. Wozniak
69bc88f1c6
Remove unwanted file
2018-05-14 09:48:31 -07:00
Daniel Wozniak
6dd3ab9f06
Merge pull request #47601 from dwoz/runas_detect
...
Skip tests when we can not use runas
2018-05-14 08:26:35 -07:00
Daniel A. Wozniak
3235ac08cb
use ignore-undefined-variable
2018-05-14 08:26:01 -07:00
rallytime
1503f1020f
Merge branch '2017.7.6' into '2017.7'
...
No conflicts.
2018-05-14 10:56:21 -04:00
Daniel Wallace
d53b44d10f
remove lock file
2018-05-13 14:35:50 -04:00
Daniel Wallace
493ed7f93d
use the toml dict format
2018-05-13 14:35:23 -04:00
Daniel Wallace
e0f7cc1447
add proxy tests decorator to pytest conftest
2018-05-13 08:38:38 -04:00
Daniel Wallace
0a621dd0ec
add Pipfile for managing dependencies in salt
2018-05-13 08:38:38 -04:00
Daniel Wallace
f78b81db94
simplify dev and base.txt to single files
...
Instead of having different files for different python versions, just have one,
and use the built in `python_version` to handle which dependencies to install.
2018-05-13 08:38:34 -04:00
Mike Place
f61ccae627
Merge pull request #47611 from Ch3LL/deb_doc
...
Update debian install docs to reflect new latest debian releases
2018-05-11 11:32:52 -05:00
Mike Place
6d2ddd050f
One more grammar fixup
2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix
2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases
2018-05-11 09:51:50 -04:00
Daniel A. Wozniak
58911d510a
Ignore pylint WindowsError
2018-05-11 01:37:12 -07:00
Nicole Thomas
9e2fe284e4
Merge pull request #47598 from rallytime/bp-47568-2017.7
...
Back-port #47568 to 2017.7
2018-05-10 18:06:19 -04:00
Nicole Thomas
8a7913ccc3
Merge pull request #47548 from Ch3LL/syslog
...
Catch Sysloghandler errors when log file does not exist
2018-05-10 16:23:24 -04:00
Ch3LL
33b4cfbc5b
Change service assertion check for systemd platforms
2018-05-10 16:16:39 -04:00
Daniel A. Wozniak
17987d3c5a
Better doc string
2018-05-10 12:11:45 -07:00
Daniel A. Wozniak
a48ac26573
Skip tests when we can not use runas
2018-05-10 12:06:56 -07:00
Nicole Thomas
82fb6ba366
Merge pull request #47508 from gtmanfred/2017.7
...
allow pulling the mysql_query.run_file to pull from the fileserver
2018-05-10 14:12:27 -04:00
