Gareth J. Greenaway
a901ec4a91
Don't save beacons when test=True
2019-03-15 17:13:21 -07:00
Pedro Algarvio
f8c0266569
Allow overriding some requirements based on distro information
2019-03-11 15:52:37 +00:00
Megan Wilhite
c58c77544d
Merge pull request #52035 from Ch3LL/bp-52012
...
Backport #52012 into 2018.3
2019-03-08 13:04:05 -05:00
Megan Wilhite
37666bd433
Merge branch '2018.3' into bp-52012
2019-03-08 10:30:54 -05:00
Megan Wilhite
54ff3fe9f8
Merge pull request #51935 from Ch3LL/py3_doc
...
Update supported python versions in installation docs
2019-03-08 10:04:50 -05:00
Daniel Wozniak
892cdaeaa7
Merge pull request #52038 from terminalmage/docs
...
Minor documentation tweak for file.replace state
2019-03-07 14:10:02 -07:00
Erik Johnson
4d82146f8c
Minor documentation tweak for file.replace state
...
Using a tilde with `:py:func:` causes it to display only the function
name and not the entire `modulepath.funcname` as the link text. This
means that it says `search()` instead of `re.search()`. While this is
still a hyperlink that goes directly to the upstream Python
documentation, using the full name as the link text should help
alleviate confusion.
2019-03-07 12:35:47 -06:00
Daniel Wozniak
a7a97544d7
Merge pull request #51896 from twangboy/win_disks
...
Add all attached drives to the disks grain
2019-03-07 11:35:00 -07:00
Daniel Wozniak
48d298c568
Merge pull request #51918 from twangboy/fix_compat
...
Fix _compat for py3
2019-03-07 11:33:27 -07:00
Daniel Wozniak
02328a617c
Merge pull request #52030 from Ch3LL/bp-52004
...
Backport #52004 into 2018.3
2019-03-07 10:53:06 -07:00
Daniel Wozniak
aa82fcc30a
Merge pull request #52029 from Ch3LL/bp-52003
...
Backport #52003 into 2018.3
2019-03-07 10:52:47 -07:00
Daniel Wozniak
5ff1725161
Merge pull request #52028 from Ch3LL/bp-50384
...
Backport #50384 into 2018.3
2019-03-07 10:52:27 -07:00
Mike Place
f2b4ec8458
Don't log debug messages during close
...
This can hit race conditions where we might not have a fully functional
logger.
2019-03-07 12:10:13 -05:00
damianos
b4e31837af
Fixed comparison of None with constants
...
There are comparisons of `None` with constant values (e.g. `'size' is None`) resulting in the comparison always being `True` or `False`.
I replaced the constant values with variable names.
I work for Semmle and I noticed these issues with out LGTM code analyzer
https://lgtm.com/projects/g/saltstack/salt/alerts/?mode=tree&ruleFocus=3980086
2019-03-07 11:38:05 -05:00
Alexander Fischer
fcac9f3e92
Skip Test on Non-Windows systems
2019-03-07 11:33:09 -05:00
Alexander Fischer
f42d17d093
Derive from LoaderModuleMockMixin
2019-03-07 11:31:35 -05:00
Alexander Fischer
5052017ea6
Define __opts__ dict
2019-03-07 11:31:35 -05:00
Alexander Fischer
b7b571e393
Define __opts__ dict
2019-03-07 11:31:35 -05:00
Alexander Fischer
ee3ad08e14
Define __opts__ dict
2019-03-07 11:31:35 -05:00
Alexander Fischer
64d8451dcb
Use default file module
2019-03-07 11:31:34 -05:00
Alexander Fischer
886ef1997e
Fix name of makedirs_ method
2019-03-07 11:31:34 -05:00
Alexander Fischer
4cc5f77b76
Check for path to be a symlink
2019-03-07 11:31:31 -05:00
Andrey Dedikov
6493eb0945
Fix issue #50381
2019-03-07 11:14:14 -05:00
Megan Wilhite
b217f948ee
Merge branch '2018.3' into py3_doc
2019-03-07 10:59:51 -05:00
Ch3LL
605bfaf7c5
Update futures dependency for python2 only
2019-03-07 10:59:01 -05:00
Shane Lee
057d415d23
Merge branch '2018.3' into win_disks
2019-03-06 12:35:34 -07:00
Gareth J. Greenaway
7ab1281a7d
Merge pull request #51936 from gtmanfred/2018.3
...
rename kubernetes module to kubernetesmod
2019-03-05 17:43:47 -08:00
Gareth J. Greenaway
faa3471c05
Merge branch '2018.3' into 2018.3
2019-03-05 17:42:18 -08:00
twangboy
a791901775
Fix compat, add tests
2019-03-05 18:38:51 -07:00
twangboy
2837bb9c17
Fix _compat for py3
2019-03-05 17:19:02 -07:00
Daniel Wozniak
2ebfa22f87
Merge pull request #51967 from twangboy/add_compat_tests
...
Add unit tests for _compat.py
2019-03-05 17:18:34 -07:00
twangboy
0d419e378c
Fix some lint
2019-03-05 17:13:08 -07:00
twangboy
aa61dabab4
Add tests
2019-03-05 17:09:07 -07:00
twangboy
9f6ec53ef0
Add all attached drives to the disks grain
2019-03-05 16:34:48 -07:00
Daniel Wozniak
c8e2971eaa
Merge pull request #51980 from Ch3LL/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-03-05 13:19:19 -07:00
Daniel Wozniak
2c4dff609c
Merge pull request #51905 from aplanas/fix_mount
...
mount: fix extra -t parameter
2019-03-05 12:55:59 -07:00
Daniel Wozniak
4b2c8cceff
Merge pull request #51815 from garethgreenaway/51673_multiple_file_sections_with_excludes
...
[2018.3] Fix to inotify beacon when multiple file paths with excludes are used
2019-03-05 12:49:38 -07:00
Daniel Wozniak
1bf3fc86f7
Merge pull request #51867 from Oloremo/mysql-module-fix-for-python3
...
Decode mysql_version for python3 compatibility
2019-03-05 12:41:52 -07:00
Daniel Wozniak
7f05abf807
Merge pull request #51908 from garethgreenaway/51862_icinga_fixes
...
[2018.3] Adding __salt__ to utils/icinga so cmd.run_all is available.
2019-03-05 12:34:26 -07:00
Shane Lee
205657804f
Merge branch '2018.3' into add_compat_tests
2019-03-05 12:17:48 -07:00
Ch3LL
9adc19eeb1
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/modules/zfs.py
2019-03-05 14:08:35 -05:00
Daniel Wozniak
c68744a6c1
Merge pull request #51975 from s0undt3ch/features/nox-2018.3
...
[2018.3] Nox fixes
2019-03-05 11:58:33 -07:00
Shane Lee
e85f0043f6
Merge branch '2018.3' into add_compat_tests
2019-03-05 10:29:43 -07:00
twangboy
ea69062fb3
Fix lint
2019-03-05 10:28:59 -07:00
Pedro Algarvio
af4ae913d0
Lint fixes
2019-03-05 17:10:33 +00:00
Pedro Algarvio
33955c9ed1
Windows needs special treatment
2019-03-05 16:39:15 +00:00
Pedro Algarvio
d4f899ffe0
Requirements fixes
2019-03-05 16:39:09 +00:00
Pedro Algarvio
e550c602e8
We need a fixed winrm-fs so that dotfiles are also included
2019-03-05 16:39:01 +00:00
Pedro Algarvio
ada1ef35fa
use kitchen-salt from my fork for now
2019-03-05 16:38:56 +00:00
Proskurin Kirill
dfcfebdcf2
Merge branch '2018.3' into mysql-module-fix-for-python3
2019-03-05 13:33:18 +00:00
