Yann Jouanin
aef37dd1ce
fix roots modification time check
2018-05-18 17:58:01 +02:00
Yann Jouanin
2a73e905df
Merge branch '2017.7.6' into 2017.7.6
2018-05-18 17:54:05 +02:00
Nicole Thomas
518f7bcc62
Merge pull request #47708 from darkpixel/47696-do-not-enumerate-none
...
Wrap properties loop with a check for None. Closes GH-47696
2018-05-18 11:25:43 -04:00
Nicole Thomas
266749420f
Merge pull request #47632 from gtmanfred/2017.7.6
...
handle new _create_stream in tornado 5.0
2018-05-18 10:25:16 -04:00
Nicole Thomas
2643c356af
Merge pull request #47720 from rallytime/bp-47692-2017.7.6
...
Back-port #47692 to 2017.7.6
2018-05-18 09:23:02 -04:00
Daniel A. Wozniak
6e5cb36839
Default windows to m1.small for ec2-classic
2018-05-18 09:21:33 -04:00
Aaron C. de Bruyn
54e9bf9ec9
Merge branch '2017.7' into 47696-do-not-enumerate-none
2018-05-17 21:34:53 -07:00
Aaron C. de Bruyn
95d4488f01
Merge branch '2017.7.6' into 47696-do-not-enumerate-none
2018-05-17 14:34:16 -07:00
Nicole Thomas
cad062eaa7
Merge pull request #47681 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.6 to 2017.7
2018-05-17 17:30:01 -04:00
Nicole Thomas
fd2d45d9c2
Merge pull request #47683 from Ch3LL/mac_user_test
...
Remove unnecessary setUp in states.test_user test for mac
2018-05-17 17:28:25 -04:00
lomeroe
49053bc106
lint fix
2018-05-17 13:56:24 -05:00
Aaron C. de Bruyn
041e4c6ddb
Wrap properties loop with a check for None. Closes GH-47696
2018-05-17 10:53:50 -07:00
Damon Atkins
83b4224cf8
Adjusted based on feed back.
2018-05-18 03:34:00 +10:00
lomeroe
6f185c9179
another lint fix
2018-05-17 12:20:49 -05:00
Damon Atkins
12f983ce9f
Whitespace lint issues
2018-05-18 02:18:35 +10:00
lomeroe
dbffba6876
fix tons of errors in my tests
2018-05-17 10:50:50 -05:00
Nicole Thomas
f323799c42
Merge pull request #47692 from dwoz/win_instance_type
...
Default windows to m1.small for ec2-classic
2018-05-17 10:44:10 -04:00
Daniel Wallace
2c50c0d2f5
fix pylint
2018-05-17 08:41:32 -05:00
Daniel Wallace
4a29057b16
Fix last test for tornado
...
Thank you so much @bdarnell for helping me get this last fix.
With this, the test suite passes with tornado 5.
2018-05-17 08:41:32 -05:00
Daniel Wallace
550ef2e272
allow using tornado 5.0
2018-05-17 08:41:32 -05:00
Daniel Wallace
62e468448b
handle new _create_stream in tornado 5.0
...
In tornado 5.0, this _create_stream function now returns a tuple instead of
just the stream.connect() object. So since we are overriding it, we need to
update.
Also initialize the SaltMessageServer with the current io_loop set.
2018-05-17 08:41:32 -05:00
lomeroe
8c9355d34c
Lint fix
2018-05-17 08:34:19 -05:00
Damon Atkins
075d3d3c49
pkg.install execution module on windows ensures the software package is
...
installed when no version is specified, it does not upgrade the software
to the latest. This is per the design. pkg.latest must provide the versions
to install to pkg.install
2018-05-17 23:04:31 +10:00
Yann Jouanin
20d9785244
fix roots modification time check
2018-05-17 13:50:51 +02:00
Daniel A. Wozniak
20b6070d54
Default windows to m1.small for ec2-classic
2018-05-16 14:37:07 -07:00
lomeroe
b29ec75da7
Update regexes in core grains for detecting the 'product' grain on
...
Solaris Sparc systems. Additionally, copy the 'product' grain to
'productname' to be consistent with other OSes.
2018-05-16 16:34:07 -05:00
twangboy
008af0ac6b
Fix unit tests
2018-05-16 15:13:41 -06:00
twangboy
87097eefb6
Add comments about how get is returning data
2018-05-16 15:13:40 -06:00
twangboy
f1f1bfc5c1
Show GPO settings, raise error if trying to set gpo managed settings
2018-05-16 15:13:40 -06:00
Erik Johnson
d0243e8f23
Suppress spurious lint failure
...
This is failing because elsewhere in the test module the get_top()
member function returns None, but this is done in a highstate attribute
which is cleaned up in the tearDown and established as a fresh
salt.state.HighState instance in the setUp.
2018-05-16 15:13:54 -05:00
Ch3LL
5a1b25b9c7
Remove unnecessary setUp in states.test_user test for mac
2018-05-16 13:54:19 -04:00
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
