Justin Findlay
8bd08012ee
modules,states.iptables support proto for policy ext
2018-04-23 12:33:47 -07:00
Mike Place
bb7850a431
Merge pull request #47249 from Ch3LL/pub_fix_rn
...
Add CVE number to 2016.3.6 Release
2018-04-23 13:05:42 -06:00
Benedikt Werner
0197c3e973
Fix pip test
2018-04-23 21:05:15 +02:00
Ch3LL
24dea24b7e
Add CVE number to 2016.3.6 Release
2018-04-23 15:03:48 -04:00
Mircea Ulinic
ad80028104
This way, we can pass flags such as `debug into the state, but also test`.
2018-04-23 16:05:28 +01:00
Nicole Thomas
56933eb0b2
Merge pull request #47227 from pruiz/pruiz/zfs-dataset-present-slow-2017.7
...
Fix issue #47225 : avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2017.7 branch)
2018-04-23 10:05:57 -04:00
Nicole Thomas
9825065048
Merge pull request #47167 from smitty42/vbox-skd-fix
...
Adding updates for python3 compatibility and new virtualbox SDK versi…
2018-04-23 09:20:41 -04:00
Dmitry Kuzmenko
39e403b18d
Merge branch '2017.7' into bugs/tornado50
2018-04-23 14:16:48 +03:00
Pablo Ruiz
fded61f19b
Fix issue #47225 : avoid zfs.filesystem_present slowdown when dataset has lots of snapshots
2018-04-21 23:54:30 +02:00
Benedikt Werner
34bf66c09f
Fix pip.installed with pip>=10.0.0
2018-04-21 13:08:08 +02:00
Chris Smith
5de53139cd
Merge branch '2017.7' into vbox-skd-fix
2018-04-20 18:01:57 -05:00
Chris Smith
91252bac95
Adding updates for python3 compatibility and new virtualbox SDK version support.
2018-04-20 17:35:28 -05:00
Daniel Wallace
976f031170
Merge pull request #47213 from dwoz/py3win
...
Fix coverage on py3 windows builds
2018-04-20 17:09:57 -05:00
Daniel A. Wozniak
ad9c7f63f0
Fix coverate on py3 windows builds
...
Setting a value for will cause coverage to look for a config file called
named '1' and in-turn raises an Exception. Based on the docs, if the
environment variable exists coverage is enabled. Just defined the
environment variable instead of giving it a value.
2018-04-20 12:30:43 -07:00
Pedro Algarvio
6706b3a2d1
Run off of a temporary config
2018-04-20 17:02:52 +01:00
Pedro Algarvio
d6873800d5
Allow running pytest>=3.5.0
2018-04-20 17:01:26 +01:00
Dmitry Kuzmenko
2da3983740
Tornado 5.0 compatibility fixes
2018-04-20 17:01:26 +01:00
Nicole Thomas
cebcd6d069
Merge pull request #47197 from dwoz/testfix
...
Move process target to top level module namespace
2018-04-20 11:41:05 -04:00
Nicole Thomas
d4269c2b70
Merge pull request #47193 from Ch3LL/network_test
...
Add network module integration tests
2018-04-20 09:37:18 -04:00
Daniel A. Wozniak
25803c9176
Move process target to top level module namespace
2018-04-19 18:38:28 -07:00
Nicole Thomas
c777248a78
Merge pull request #47189 from Ch3LL/autoruns
...
Add autoruns.list integration test for Windows
2018-04-19 17:16:33 -04:00
Ch3LL
bbf9987c19
Add network module integration tests
2018-04-19 16:17:35 -04:00
Nicole Thomas
65f344e371
Merge pull request #47184 from Ch3LL/status_test
...
Add status module integration modules tests for Windows
2018-04-19 15:38:55 -04:00
Nicole Thomas
965600ad6c
Merge pull request #47163 from rallytime/jenkins-autodoc
...
Updage jenkins module autodocs to use jenkinsmod name instead
2018-04-19 15:34:59 -04:00
Ch3LL
6a88bedb7a
Add autoruns to windows whitelist
2018-04-19 15:12:08 -04:00
Ch3LL
e9e4d4af70
Add autoruns.list integration test for Windows
2018-04-19 15:09:50 -04:00
Nicole Thomas
0a43dde5fc
Merge pull request #47185 from twangboy/add_tests
...
Add additional integration tests to whitelist
2018-04-19 14:20:24 -04:00
Daniel Wozniak
1a600bb9a4
Merge pull request #47172 from dwoz/cover_without_admin
...
Allow non admin name based runs on windows
2018-04-19 10:26:41 -07:00
twangboy
345daa0423
Add additional integration tests to whitelist
2018-04-19 10:52:14 -06:00
Ch3LL
25a84428b8
Add status module integration modules tests for Windows
2018-04-19 12:01:40 -04:00
Daniel A. Wozniak
cadd759727
Use warnings to warn user
2018-04-19 08:26:50 -07:00
Daniel A. Wozniak
144c68e214
Allow non admin name based runs on windows
2018-04-19 00:18:17 -07:00
rallytime
0039395017
Updage jenkins module autodocs to use jenkinsmod name instead
...
Refs #46801
The jenkins module was renamed to jenkinsmod recently, but the autodoc
files were never updated.
We need to remove the jenkins.py docs from the docbuild server, but we
can't do that if the new docs for jenkinsmod.py aren't building yet.
This PR updates the autodoc files to point to the new file.
2018-04-18 15:14:30 -04:00
Nicole Thomas
d5997d2301
Merge pull request #47110 from kstreee/fix-misusing-of-timeout
...
Fixes misusing of the timeout option.
2018-04-18 13:16:19 -04:00
Nicole Thomas
87ca2b4003
Merge pull request #40961 from terminalmage/issue40948
...
Make error more explicit when PKI dir not present for salt-call
2018-04-18 12:08:16 -04:00
Nicole Thomas
f5e63584d4
Merge pull request #47134 from Ch3LL/user_win_test
...
Add user integration tests for windows OS
2018-04-18 10:29:39 -04:00
Erik Johnson
6ba66cca41
Fix incorrect logic in exception check
2018-04-17 16:51:26 -05:00
Nicole Thomas
da2f6a3fac
Merge pull request #47131 from gtmanfred/cli
...
add __cli opts variable for master processes
2018-04-17 17:33:56 -04:00
Ch3LL
e7c9bc4038
Add user integration tests for windows OS
2018-04-17 16:45:41 -04:00
Nicole Thomas
9b8e6ffb8c
Merge pull request #47129 from rallytime/bp-47121
...
Back-port #47121 to 2017.7
2018-04-17 16:45:10 -04:00
Nicole Thomas
eb5ac51a48
Merge pull request #47102 from gtmanfred/2017.7
...
dont allow using no_use_wheel for pip 10.0.0 or newer
2018-04-17 16:44:57 -04:00
Daniel Wallace
1b1c29bf62
add __cli for master processes
2018-04-17 15:00:43 -05:00
Jeff.JF Lin
11da526b21
add ImportError
2018-04-17 15:07:47 -04:00
Jeff.JF Lin
bd0c23396c
fix pip.req import error in pip 10.0.0
2018-04-17 15:07:47 -04:00
Daniel Wallace
c1dc42e67e
Merge pull request #47037 from twangboy/fix_dev_scripts
...
Fix build_env scripts
2018-04-17 13:54:16 -05:00
Daniel Wallace
3dc93b310b
fix tests
2018-04-17 13:18:18 -05:00
Daniel Wallace
8497e08f8e
fix pip module for 10.0.0
...
Fixes #46971
2018-04-17 09:23:03 -05:00
Daniel Wallace
4c07a3d1e9
fix other tests
2018-04-17 09:23:03 -05:00
Daniel Wallace
b71e3d8a04
dont allow using no_use_wheel for pip 10.0.0 or newer
...
The --no-use-wheel flag has been deprecated in pip 10.0.0
2018-04-17 09:23:02 -05:00
kstreee
0624aee0ed
Fixes misusing of the timeout option.
2018-04-17 14:21:15 +09:00
