Mike Place
593c7ff085
Merge pull request #50147 from garethgreenaway/50129_network_get_route_fails_dash_in_name
...
[2018.3] Fix to modules/network.py
2018-10-22 08:31:02 -06:00
Mike Place
5c7a7d97aa
Merge pull request #50156 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-22 08:24:38 -06:00
rallytime
87e20fd9a0
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-10-22 10:15:39 -04:00
Damon Atkins
aebce88d82
Merge branch '2017.7' into jenkins_pylint
2018-10-23 00:35:54 +11:00
Daniel Wallace
ce375f4ac3
Merge pull request #50148 from MTecknology/proxmox-fixups
...
Proxmox fixups
2018-10-22 06:55:09 -05:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py
2018-10-21 08:39:29 -07:00
Damon Atkins
5f708fac39
use awk to create the other files, so git does not need to search again
2018-10-21 20:06:41 +11:00
Daniel Wallace
1a90c4fde2
Merge pull request #50144 from dwoz/winrm_fs_release
...
Use newest winrm-fs release
2018-10-20 19:53:36 -05:00
Michael Lustfield
49599475b1
Race condition still exists at one second timeout.
2018-10-20 19:27:58 -05:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers.
2018-10-20 19:03:40 -05:00
Gareth J. Greenaway
311796994b
Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route.
2018-10-20 15:57:25 -07:00
Daniel A. Wozniak
0951d85433
Use newest winrm-fs release
2018-10-20 14:22:55 -07:00
Damon Atkins
6b96a24b97
Adjust jenkins linting process, only run stage if required, use git diff to find files, instead of find, report on status, changed and deleted files, lint only changed files.
2018-10-21 01:30:54 +11:00
Erik Johnson
6e15bc58ff
Remove duplicate policy (fixes lint)
2018-10-19 15:23:02 -05:00
Erik Johnson
8592a0b90e
Add some debug logging before and after states gather pillar data
...
This will help definitively identify instances where a salt-call is
delayed because it is waiting for pillar data from the master.
2018-10-19 15:09:50 -05:00
Erik Johnson
c1dd362ce2
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine
...
Conflicts:
- salt/utils/schedule.py
- tests/integration/scheduler/test_eval.py
- tests/integration/scheduler/test_skip.py
- tests/unit/modules/test_yumpkg.py
2018-10-19 13:56:46 -05:00
Daniel Wozniak
0ece06ef66
Merge pull request #50085 from dwoz/win_pkg_redux
...
Fix `test_win_pkg` yet again
2018-10-19 11:16:15 -07:00
Mike Place
bfce09c2fe
Merge pull request #49937 from ssc-services/fix-virt-what-multiline-results
...
Fix value of `virtual` grain when using `virt-what`
2018-10-19 07:27:42 -06:00
Mike Place
0069247ddf
Merge pull request #49980 from twangboy/lgpo_add_printer_drivers
...
Add support for AddPrinterDrivers
2018-10-19 07:19:40 -06:00
Mike Place
dd75897a5e
Merge pull request #50103 from twangboy/mf_49872
...
Merge Forward 49872 to Fluorine
2018-10-19 05:50:11 -06:00
Mike Place
e2c39d7880
Merge pull request #50111 from cbosdo/fluorine-backport
...
Fluorine backport of PR #50109
2018-10-19 05:47:05 -06:00
Mike Place
68bd12968a
Merge pull request #50112 from rallytime/merge-fluorine
...
[fluorine] Merge forward from 2018.3 to fluorine
2018-10-19 05:46:34 -06:00
Mike Place
de23c83f54
Merge pull request #50114 from rallytime/bp-50061
...
Back-port #50061 to 2018.3
2018-10-19 05:46:02 -06:00
Mike Place
9188bec831
Merge pull request #50115 from garethgreenaway/apply_49104_to_2018_3
...
[2018.3] Apply scheduler fixes and tests from #49104 to 2018.3
2018-10-19 05:45:30 -06:00
Mike Place
e892042a67
Merge pull request #50119 from terminalmage/boto-tests
...
Squelch spurious errors logged in unit tests
2018-10-19 05:42:30 -06:00
Mike Place
35449b4b14
Merge pull request #50120 from terminalmage/salt-jenkins-1137
...
Fix bad merge conflict resolution
2018-10-19 05:38:34 -06:00
Mike Place
98be3e78bc
Merge pull request #50121 from gtmanfred/fluorine
...
mark log jid test as flaky
2018-10-19 03:54:15 -06:00
Elias Probst
08b1b17465
Add release notes for virtual grain fix
2018-10-19 01:03:25 +02:00
Elias Probst
4b5421a0f5
Fix value of virtual grain when using virt-what
...
`virt-what` might return multiple lines, depending on what it detected (e.g. `lxc` inside a `HyperV` VM), where the last line corresponds to the most likely match.
Until now, Salt evaluated the whole multi-line output as a single string, which caused quite inaccurate matches. This commit changes this behavior to only evaluate the last line of the `virt-what` output.
A similar issue is described in #25697 , but might actually have a different root cause.
2018-10-19 01:03:25 +02:00
Daniel Wallace
677b9bdfa4
mark log jid test as flaky
2018-10-18 14:54:09 -05:00
Erik Johnson
91812ff510
Squelch spurious errors logged in unit tests
...
We are getting errors in the LazyLoader because certain functions are
not present in the LazyDict due to being left out of the whitelist.
These don't cause the tests to fail, but they do result in a lot of
spurious errors in the test suite.
2018-10-18 14:01:28 -05:00
Erik Johnson
1ddfd26e9f
Fix bad merge conflict resolution
...
b98df6d
2018-10-18 12:39:55 -05:00
Gareth J. Greenaway
adb1e79723
Apply scheduler fixes and tests from #49104 to 2018.3
2018-10-18 08:27:59 -07:00
Erik Johnson
1f09104b0d
Add unit test for pkg.install with epoch
2018-10-18 11:16:58 -04:00
zr
af253c6542
pkg.install bugfix
2018-10-18 11:15:42 -04:00
Mike Place
e0965603bf
Merge pull request #50113 from rallytime/bp-49989
...
Back-port #49989 to 2017.7
2018-10-18 17:14:22 +02:00
William Giokas
27c7ac94b7
Increase centos7-py2 kitchen pr timeout to 8 hours
...
The centos7-py2 tests have been consistently failing to finish before
the timeout. I am increasing the timeout for these tests to 8 hours in
order to see if we can finish a few of them. They should get much closer
to finishing as the branch tests have been finishing at around the 6:30
or 7:00 mark sometimes.
2018-10-18 11:11:59 -04:00
rallytime
c46cccbebf
Remove unused imports
2018-10-18 11:07:24 -04:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine'
...
Conflicts:
- doc/ref/tops/all/index.rst
- salt/fileclient.py
- salt/grains/core.py
- salt/modules/win_file.py
- salt/pillar/__init__.py
- salt/utils/http.py
2018-10-18 10:41:42 -04:00
Cédric Bosdonnat
61937feeb9
test_virt pylint fix
2018-10-18 15:23:33 +02:00
Cédric Bosdonnat
9e61d86303
virt: allow creating or updating VM with no nic or disk
...
Some users may want to create a VM with no network interface at all, or
remove all network interfaces from an existing one. This commit allows
this in the virt.init and virt.update functions.
For the sake of consistency, the same behavior has been applied to disks
as well... even though it makes no sense to have a VM with no disk at
all.
2018-10-18 15:23:24 +02:00
Mike Place
5123488dc2
Merge pull request #50013 from Giandom/2018.3
...
Passed kwargs to db_exists in db_remove method
2018-10-18 13:28:29 +02:00
Mike Place
f22630eacb
Merge branch '2018.3' into win_pkg_redux
2018-10-18 13:06:31 +02:00
Mike Place
f7f8cb533f
Merge pull request #50094 from rallytime/doc-errs
...
Fix varstack_top naming in docs
2018-10-18 12:49:24 +02:00
twangboy
223c4f28b3
Merge Forward 49872 to Fluorine
...
https://github.com/saltstack/salt/pull/49872
2018-10-17 16:45:32 -06:00
Daniel A. Wozniak
0b033a645f
Do not allow age to be a negative number
2018-10-17 13:35:14 -07:00
Nicole Thomas
aa94f6009d
Merge pull request #50092 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-17 15:57:06 -04:00
Nicole Thomas
c3387a70bf
Merge pull request #50093 from rallytime/flaky-lxd-tests
...
Mark lxd_container integration tests as flaky
2018-10-17 15:45:36 -04:00
Nicole Thomas
d1f2c5d47e
Merge pull request #50082 from garethgreenaway/50073_fixing_typo_boto_cloudfront
...
[2018.3] Fixing a typo in the boto_cloudfront
2018-10-17 15:34:59 -04:00
Nicole Thomas
d0c68df885
Merge pull request #49878 from rallytime/merge-fluorine
...
[fluorine] Merge forward from 2018.3 to fluorine
2018-10-17 13:58:31 -04:00
