Nicole Thomas
|
0327ea0469
|
Merge pull request #50522 from cbosdo/fluorine-backport
Test and fix disk creation in virt.init
|
2018-11-15 09:48:06 -05:00 |
|
Nicole Thomas
|
a8ca8f71ba
|
Merge pull request #50512 from Ch3LL/merge-fluorine
[fluorine] Merge forward from 2018.3 to fluorine
|
2018-11-15 09:38:42 -05:00 |
|
Janik Schüssler
|
3d7a4d5735
|
Allow to specify used trustmodel in gpg.verify
|
2018-11-15 13:52:23 +01:00 |
|
Damon Atkins
|
828990c248
|
typo
|
2018-11-15 21:10:24 +11:00 |
|
Cédric Bosdonnat
|
0786123d03
|
Test and fix disk creation in virt.init
Adding a test case in virt.init uncovered a few issues: a passed
exception that we really want to report to the user, and disks that
were not created.
|
2018-11-15 10:57:30 +01:00 |
|
Daniel A. Wozniak
|
d3620c3356
|
Always set .gitconfig dir to user's home
|
2018-11-15 00:58:44 -07:00 |
|
Nicole Thomas
|
b0446f527e
|
Merge pull request #50500 from terminalmage/2017.7-docs
Set jenkins docs job to treat any warnings as errors
|
2018-11-14 14:30:27 -05:00 |
|
Nicole Thomas
|
d83da51d8b
|
Merge pull request #50503 from terminalmage/2018.3-docs
Set jenkins docs job to treat any warnings as errors (2018.3 branch)
|
2018-11-14 14:30:23 -05:00 |
|
Nicole Thomas
|
9c24fb6373
|
Merge pull request #50498 from terminalmage/fluorine-docs
Fix docs build warnings in fluorine
|
2018-11-14 14:27:06 -05:00 |
|
Gareth J. Greenaway
|
fa2f4a5595
|
Merge pull request #50514 from bornwitbugs/load_beacon_fix
Load beacon fix
|
2018-11-14 11:20:32 -08:00 |
|
Erik Johnson
|
1d39f88301
|
Make fluorine docs use the latest available release for download links
|
2018-11-14 12:45:05 -06:00 |
|
bornwitbugs
|
e59ced6507
|
Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix
|
2018-11-14 17:54:37 +00:00 |
|
Nicole Thomas
|
a50377be29
|
Merge pull request #50509 from Ch3LL/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2018-11-14 12:52:05 -05:00 |
|
Ch3LL
|
8501581f27
|
Merge branch '2018.3' into 'fluorine'
Conflicts:
- salt/utils/mac_utils.py
- salt/utils/win_runas.py
- tests/support/case.py
|
2018-11-14 12:38:16 -05:00 |
|
Ch3LL
|
178dab3a4b
|
Merge branch 2017.7 into 2018.3
Conflicts:
- doc/topics/tutorials/salt_bootstrap.rst
- tests/integration/cloud/clouds/test_digitalocean.py
|
2018-11-14 10:33:44 -05:00 |
|
Damon Atkins
|
28f1595473
|
update windows min package defintion setting
|
2018-11-15 01:38:16 +11:00 |
|
Nicole Thomas
|
55b4914644
|
Merge pull request #50502 from twangboy/lgpo_2018.3
Add definition for RestrictRemoteSAM
|
2018-11-14 09:30:37 -05:00 |
|
Erik Johnson
|
ae96e29032
|
Fix docs configuration for renamed logstash engine
|
2018-11-13 19:05:29 -06:00 |
|
Erik Johnson
|
a4fc1087a3
|
Fix docs configuration for renamed logstash engine
|
2018-11-13 19:04:46 -06:00 |
|
Nicole Thomas
|
9e63cde7c5
|
Merge pull request #50472 from cbosdo/fluorine-backport
Fix virt.update for NICs mac and model
|
2018-11-13 16:17:30 -05:00 |
|
Erik Johnson
|
5b064646f7
|
Set docs jenkins job to treat warnings as errors
|
2018-11-13 15:01:10 -06:00 |
|
Erik Johnson
|
9b6c6697ea
|
Update docs references for states with func_alias
|
2018-11-13 15:01:10 -06:00 |
|
Erik Johnson
|
3adcfacc8b
|
Set docs jenkins job to treat warnings as errors
|
2018-11-13 14:59:51 -06:00 |
|
Erik Johnson
|
d7a31803b7
|
Update docs references for states with func_alias
|
2018-11-13 14:59:51 -06:00 |
|
Erik Johnson
|
06be9d2896
|
Disable custom sphinx automodule
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
|
2018-11-13 14:53:13 -06:00 |
|
Erik Johnson
|
62b5d400b6
|
Disable custom sphinx automodule
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
|
2018-11-13 14:51:12 -06:00 |
|
twangboy
|
fe92a3a506
|
Add definition for RestrictRemoteSAM
|
2018-11-13 13:14:58 -07:00 |
|
Mike Place
|
c1dde7e9b1
|
Merge pull request #50328 from rallytime/fix-48734
Fix issue with salt-run jobs.list_jobs where Target: unknown-target
|
2018-11-13 12:49:57 -07:00 |
|
Erik Johnson
|
870a364a78
|
Set docs jenkins job to treat warnings as errors
|
2018-11-13 13:25:58 -06:00 |
|
Erik Johnson
|
e03bdcdc60
|
Update docs references for states with func_alias
|
2018-11-13 13:25:58 -06:00 |
|
Erik Johnson
|
8a2c08f683
|
Disable custom sphinx automodule
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
|
2018-11-13 13:25:58 -06:00 |
|
Daniel Wozniak
|
351faeb952
|
Merge pull request #50499 from dwoz/build_fix
Fix 2018.3 build
|
2018-11-13 11:46:54 -07:00 |
|
Daniel A. Wozniak
|
5754b4a7c6
|
Fix 2018.3 build
|
2018-11-13 11:33:26 -07:00 |
|
Mike Place
|
6f4b23f689
|
Merge pull request #50496 from terminalmage/2018.3-docs
Fix 2018.3 docs build warnings
|
2018-11-13 10:21:08 -07:00 |
|
Erik Johnson
|
ee835b10bc
|
Fix fluorine docs build warnings
|
2018-11-13 11:10:11 -06:00 |
|
Nicole Thomas
|
c00fd43ee9
|
Merge pull request #50493 from rallytime/bp-50362
Back-port #50362 to 2017.7
|
2018-11-13 11:59:50 -05:00 |
|
Nicole Thomas
|
6b272c1d65
|
Merge pull request #50492 from rallytime/bp-50228-and-50443
Back-port #50228 and #50443 to 2018.3
|
2018-11-13 11:59:14 -05:00 |
|
Nicole Thomas
|
3cac1d0de7
|
Merge pull request #50494 from terminalmage/2017.7-docs
Late import to fix docs build errors
|
2018-11-13 11:29:22 -05:00 |
|
rallytime
|
7879a2d791
|
Fix logging format
|
2018-11-13 11:27:57 -05:00 |
|
Erik Johnson
|
9754791db6
|
Fix header underline length to avoid another sphinx warning
|
2018-11-13 10:19:33 -06:00 |
|
Erik Johnson
|
cb256418a9
|
Fix header underline length to avoid another sphinx warning
|
2018-11-13 10:18:47 -06:00 |
|
Erik Johnson
|
d6e1ee47c1
|
Fix more sphinx build errors
|
2018-11-13 10:17:55 -06:00 |
|
Erik Johnson
|
82bedb4b46
|
Late import to fix docs build errors
|
2018-11-13 10:17:54 -06:00 |
|
Erik Johnson
|
7c298b27b0
|
Fix sphinx build warnings in 2018.3 branch
The async renaming for Python 3.7 needed to be reproduced here as well.
|
2018-11-13 10:17:37 -06:00 |
|
Erik Johnson
|
9272f7b735
|
Fix more sphinx build errors
|
2018-11-13 09:56:42 -06:00 |
|
Erik Johnson
|
18a8104aae
|
Late import to fix docs build errors
|
2018-11-13 08:48:43 -06:00 |
|
Erik Johnson
|
d4571328ed
|
Fix sphinx build warnings in 2018.3 branch
The async renaming for Python 3.7 needed to be reproduced here as well.
|
2018-11-13 08:47:12 -06:00 |
|
Erik Johnson
|
d561b26f10
|
Late import to fix docs build errors
|
2018-11-13 08:45:10 -06:00 |
|
rallytime
|
f578392eb4
|
Lint Fix: add mock_open import
|
2018-11-13 09:30:02 -05:00 |
|
twangboy
|
60559cfa8a
|
Remove flaky test
|
2018-11-13 09:25:47 -05:00 |
|