Alberto Planas
da2e632566
parted: fix the ordering of list command
...
The command `parted -m -s {} print` do not print the "Type" column,
but after the "File System" column print the name of the partition.
This point that the type of the partition cannot be extracted using
parted with machine parseable output.
(cherry picked from commit f23d618e11
2019-01-30 11:02:26 +01:00
Daniel Wozniak
d4b90933ac
Merge pull request #51336 from Ch3LL/merge-2019.2.0rc1
...
[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2
2019-01-27 16:55:08 -07:00
Daniel Wozniak
02b43a09fb
Merge pull request #51334 from Ch3LL/merge-2019.2
...
[2019.2] Merge forward from 2018.3 to 2019.2
2019-01-27 16:49:31 -07:00
Pedro Algarvio
62a20b1917
Remove unused import
2019-01-27 20:34:06 +00:00
Gareth J. Greenaway
2284ea5162
Merge branch '2019.2' into merge-2019.2.0rc1
2019-01-25 11:30:27 -08:00
Ch3LL
18bf2369f8
Merge branch '2019.2.0.rc1' into 2019.2
...
Conflicts:
- salt/modules/win_lgpo.py
2019-01-25 14:27:17 -05:00
Pedro Algarvio
95607d17db
Merge pull request #51314 from s0undt3ch/features/tox-runtests-2019.2
...
[2019.2] Allow running runtests.py using tox
2019-01-25 18:56:00 +00:00
Ch3LL
25ec653fd4
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- .codecov.yml
- salt/modules/artifactory.py
2019-01-25 13:19:07 -05:00
Megan Wilhite
c11838757e
Merge pull request #50974 from max-arnold/salt-call-executor-options
...
[Fluorine] Unify salt-call/salt executor arguments
2019-01-25 09:42:31 -05:00
Megan Wilhite
b49ac1e7ec
Merge pull request #51300 from twangboy/merge_context
...
Bring __context__ usage in LGPO to rc1
2019-01-25 09:21:13 -05:00
Pedro Algarvio
39fb981faa
"Tell" coverage to track subprocesses.
2019-01-25 13:03:26 +00:00
Pedro Algarvio
f62cc11d78
Merge pull request #51324 from garethgreenaway/1257_something_something_bytes_argh_python2
...
[2018.3] Fixes to x509 module and test
2019-01-25 09:34:59 +00:00
Pedro Algarvio
bd7072f3c8
Merge branch '2018.3' into 1257_something_something_bytes_argh_python2
2019-01-25 09:34:49 +00:00
Pedro Algarvio
b44cd84cb2
Merge pull request #51323 from garethgreenaway/network_dns_check_test
...
[2018.3] Adding a test to ensure dns_check works as expected.
2019-01-25 09:28:16 +00:00
Pedro Algarvio
055eadc1c0
Merge branch '2018.3' into network_dns_check_test
2019-01-25 09:28:00 +00:00
Daniel Wozniak
be57a0f55c
Merge pull request #51321 from terminalmage/issue51256
...
Fix 500 error when using wheel_async
2019-01-24 20:51:34 -07:00
Gareth J. Greenaway
0e542c5515
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3
2019-01-24 16:41:49 -08:00
Pedro Algarvio
f27589aff7
Remove unused imports
2019-01-24 23:21:00 +00:00
Pedro Algarvio
3000d2095d
Fix tests. We no longer get ipaddress instances back.
2019-01-24 23:15:21 +00:00
twangboy
8fcf235b75
Fix minion start issue
2019-01-24 23:15:21 +00:00
Pedro Algarvio
a26ba7f3aa
Don't fail the test because of order
2019-01-24 23:15:21 +00:00
Gareth J. Greenaway
c847f54293
Swap passed addr for string rather than ipaddress object.
2019-01-24 15:04:27 -08:00
Gareth J. Greenaway
87f3972606
removing another debugging log.
2019-01-24 14:52:31 -08:00
Gareth J. Greenaway
ad64efbabe
Use MagicMock
2019-01-24 14:51:17 -08:00
Gareth J. Greenaway
172ad2e021
removing debugging
2019-01-24 14:50:05 -08:00
Gareth J. Greenaway
5812eae808
Adding a test to ensure dns_check works as expected.
2019-01-24 14:48:41 -08:00
Gareth J. Greenaway
0af4675f8d
Merge pull request #51318 from garethgreenaway/51273_only_allow_auth_valid_parameters
...
[2019.2.0rc1] Fix to __auth_call
2019-01-24 14:27:00 -08:00
Erik Johnson
d9c4462c4e
Fix 500 error when using wheel_async
...
When `wheel_async` is used, the job completes, but for the same reason
we couldn't replace the signal in the first place, we fail to restore it
after control is returned to the context manager.
This fixes this by only adding the signal data to the `old_signals` dict
when we successfully override the signal handling, so that we don't
incorrectly attempt to "restore" the signal later.
2019-01-24 16:23:29 -06:00
Gareth J. Greenaway
3dbe8dc8be
When making auth calls, only username, password, auth, and token are valid, so we strip anything else out.
2019-01-24 12:45:35 -08:00
Pedro Algarvio
138ca2e682
Show objects on assertion failure
2019-01-24 17:02:13 +00:00
Pedro Algarvio
840b3d2103
Add pytest-salt-from-filenames to pytest requirements
2019-01-24 17:02:13 +00:00
Pedro Algarvio
716bda4414
Remove duplicate dependency
2019-01-24 17:02:13 +00:00
Pedro Algarvio
6d62156a11
Add .coveragerc
2019-01-24 17:02:13 +00:00
Pedro Algarvio
6bb56ced2e
Run tests from tox, wether runtests or pytest
2019-01-24 17:02:13 +00:00
Megan Wilhite
9d487f20ec
Merge branch '2019.2.0.rc1' into merge_context
2019-01-24 11:09:57 -05:00
Megan Wilhite
a57b1e2c6c
Merge branch '2019.2.0.rc1' into salt-call-executor-options
2019-01-24 11:05:49 -05:00
Pedro Algarvio
b348034f96
Merge pull request #51307 from s0undt3ch/2019.2
...
Add 2019.2 codecov config
2019-01-24 13:34:24 +00:00
Pedro Algarvio
85e7ac67c1
Merge pull request #51306 from s0undt3ch/2018.3
...
Add 2018.3 codecov config
2019-01-24 13:34:13 +00:00
Pedro Algarvio
495aa5c8a3
Add 2019.2 codecov config
2019-01-24 13:30:11 +00:00
Pedro Algarvio
5f0f296a1a
Add 2018.3 codecov config
2019-01-24 13:28:59 +00:00
Pedro Algarvio
d6f4f055f5
Merge pull request #51298 from terminalmage/issue51258
...
Fix edge case when minion ID is a 16-character string
2019-01-24 11:42:01 +00:00
Pedro Algarvio
f94e721e75
Merge branch '2019.2.0.rc1' into issue51258
2019-01-24 11:41:48 +00:00
Pedro Algarvio
5a398a3503
Merge pull request #51207 from twangboy/fix_test_pkg
...
Backport 50771 to 2018.3
2019-01-24 11:40:08 +00:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg
2019-01-24 11:39:57 +00:00
Pedro Algarvio
7a97cb4f67
Merge pull request #51252 from dwoz/issue-50221
...
Peserve newlines from pillar data for file.managed [2018.3]
2019-01-24 11:37:06 +00:00
Pedro Algarvio
f96828a9d6
Merge branch '2018.3' into issue-50221
2019-01-24 11:36:52 +00:00
Pedro Algarvio
cd5b50399a
Merge pull request #51296 from Ch3LL/bp-51285
...
Backport #51285 into 2019.2.0.rc1
2019-01-24 09:34:05 +00:00
Pedro Algarvio
253f5e4608
Merge pull request #51264 from gtmanfred/2018.3
...
an argument is not always needed to be passed to open a file
2019-01-24 07:55:25 +00:00
Pedro Algarvio
f3ebd32246
Merge branch '2018.3' into 2018.3
2019-01-24 07:55:12 +00:00
twangboy
3ed7b84792
Use __context__ in LGPO module
2019-01-23 14:22:35 -07:00
