Mike Place
4bebe381d1
Bah. lint fix.
2017-06-26 15:00:25 -06:00
Sergey Kizunov
81e29061b0
In pydsl render, convert sls to str before using
...
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-06-26 13:20:54 -05:00
Sergey Kizunov
40317193f9
PY3.6: Eliminate imp module DeprecationWarning
...
This warning keeps recurring:
```
DeprecationWarning: the imp module is deprecated in favour of
importlib; see the module's documentation for alternative uses
```
The `imp` module is deprecated in Python 3.6 and will likely be
removed altogether in a future version of Python.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-06-26 13:20:54 -05:00
Mike Place
1c74b8909e
Merge pull request #41942 from terminalmage/add-maxdiff
...
Add maxDiff to pyobjects test for troubleshooting
2017-06-26 13:01:30 -05:00
Mike Place
3a62840f0b
Merge pull request #41925 from Ch3LL/datastore_vmware
...
Add vmware test to check new disk on seperate datastore
2017-06-26 13:00:16 -05:00
Mike Place
e28e10ded2
Merge pull request #41914 from vutny/fix-archive-extracted-local-file-hash
...
archive.extracted: fix hash sum verification for local archives
2017-06-26 12:59:27 -05:00
Erik Johnson
3fac9b3b06
Add maxDiff to pyobjects test for troubleshooting
2017-06-26 12:58:49 -05:00
Mike Place
4c14a345ed
Lint fix to remove unused imports
2017-06-26 11:53:17 -06:00
Erik Johnson
7475a334a0
Use a custom dumper to ensure defaultdict and odict work
...
These types are not recognized automatically by PyYAML, so use a custom
dumper with representers added for these data types.
2017-06-26 12:49:14 -05:00
Mike Place
41c65b0e2c
Gate assert check behind mock ver
2017-06-26 11:04:49 -06:00
Denys Havrysh
54910fe55f
archive.extracted: fix hash sum verification for local archives
2017-06-26 19:08:47 +03:00
Erik Johnson
76ad6ff064
Merge pull request #41912 from Ch3LL/fix_manjaro
...
Allow pacman module to run on Manjaro
2017-06-26 10:35:20 -05:00
Mike Place
ff67d47a2e
Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection
...
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
2017-06-26 09:41:38 -05:00
Erik Johnson
2d798de982
Better support for numeric saltenvs
...
When passing the saltenv on the CLI when running states, it is passed
through PyYAML. This means that a numeric saltenv (e.g. 2017.7) would be
loaded as a float, causing an error when the fileclient runs
salt.utils.path_join() and passes the numeric saltenv as one of the path
components.
This commit forces CLI saltenvs to be strings.
2017-06-26 08:59:37 -05:00
Erik Johnson
7c822b665d
Merge pull request #41934 from isbm/isbm-missing-rc-doc-wildcards
...
Add missing doc info for pressrelease
2017-06-26 08:56:42 -05:00
Bo Maryniuk
c2b5e50d50
Add missing doc info for pressrelease
2017-06-26 14:38:19 +02:00
David Beitey
0e4b3d9a42
Fix Composer state's name docs; formatting
...
Ensures the docs mention the `name` argument rather than `dir` (which comes from the module). This also adds some formatting to improve clarity/readability in doc output when rendered to HTML.
2017-06-26 16:11:59 +10:00
kstreee
df96969959
Removes redundant closing statements.
2017-06-26 04:58:24 +00:00
Ch3LL
9a4b3dbaba
Fix some formatting
2017-06-23 18:46:25 -04:00
Ch3LL
73271ce94d
Add vmware test to check new disk on seperate datastore
2017-06-23 18:36:50 -04:00
Mike Place
2841ab330e
Merge pull request #41889 from cachedout/2016_11_to_7
...
Merge forward 2016.11 to 2017.7
2017-06-23 15:13:14 -05:00
Mike Place
871b21c1d8
Merge pull request #15 from whiteinge/load_args_and_kwargs-madness
...
Update _reformat_low to call both parse_input and load_args_and_kwargs
2017-06-23 14:00:10 -05:00
Seth House
e49af86a2e
Update _reformat_low to call both parse_input and load_args_and_kwargs
...
Follow-up to the TODO in #41786 .
2017-06-23 12:17:14 -06:00
Mike Place
15239c6e90
Merge pull request #41916 from terminalmage/remove-gitpython
...
Remove GitPython from dev requirements files
2017-06-23 12:34:28 -05:00
Mike Place
eb2bf865b8
Merge branch '2016_11_to_7' of github.com:cachedout/salt into 2016_11_to_7
2017-06-23 10:51:04 -06:00
Mike Place
5f34fb516b
Merge pull request #14 from terminalmage/merge-2017.7
...
Add building_highstate odict to mock HighState class
2017-06-23 11:50:23 -05:00
Erik Johnson
61870075aa
Add building_highstate odict to mock HighState class
2017-06-23 11:48:00 -05:00
Mike Place
bee68beb8e
Lint fix
2017-06-23 10:18:06 -06:00
Mike Place
00746cafce
Lint fix for win_certutil
2017-06-23 10:11:48 -06:00
Ch3LL
e4dd72a3e7
Update os_name_map in core grains for new manjaro systems
2017-06-23 10:12:58 -04:00
Erik Johnson
e178f08d3a
Remove GitPython from dev requirements files
...
This was added in the past because we put git_pillar configuration in
the integration suite's master config file. However, now that git_pillar
is being tested in its own separate way and no longer requires the
git_pillar config to be in the master config file, it has been removed.
This makes GitPython unnecessary in the dev requirements file. The
reason it was there before was mainly to squelch a bunch of critical
errors that would occur every time the test suite would attempt to
compile the git_pillar items and failed if GitPython wasn't installed.
This was more for the benefit of users running the test suite on their
own than for our jenkins setup of course, since we were installing
GitPython on the Jenkins VMs.
2017-06-23 07:17:51 -05:00
Mike Place
8647086de8
Merge branch '2016_11_to_7' of github.com:cachedout/salt into 2016_11_to_7
2017-06-22 15:39:38 -06:00
Mike Place
048befb5fe
Fix lint
2017-06-22 15:36:21 -06:00
Ch3LL
aa7c839fc5
Allow pacman module to run on Manjaro
2017-06-22 16:39:36 -04:00
Mike Place
b2f7dbd2f0
Merge pull request #13 from terminalmage/merge-2017.7
...
Fix default opts handling
2017-06-22 13:54:32 -05:00
Erik Johnson
2ee43fc743
Fix default opts handling
...
Starting in 2017.7 the dunder dicts are handled differently in unit
tests.
2017-06-22 13:40:40 -05:00
Mike Place
7697d0d1d2
Remove merge conflict line
2017-06-22 12:35:28 -06:00
Mike Place
80cb57e02b
Fix win_certutil merge error
2017-06-22 11:40:56 -06:00
Mike Place
c89cd2a4bf
Merge pull request #41890 from cachedout/locale_doc
...
Locale doc
2017-06-22 12:34:46 -05:00
Mike Place
6a46169605
Merge pull request #12 from terminalmage/merge-2017.7
...
Remove old 2016.11 code accidentally included in merge-forward
2017-06-22 11:39:33 -05:00
Erik Johnson
00e046bc42
Remove old 2016.11 code accidentally included in merge-forward
2017-06-22 11:37:39 -05:00
Mike Place
c90cb6798a
Merge pull request #41888 from Ch3LL/change_release
...
Add additional commits to 2016.11.6 release notes
2017-06-22 11:18:59 -05:00
Mike Place
d12539f3c4
Merge pull request #41892 from UtahDave/nitrogenlocal
...
A couple small bugfixes.
2017-06-22 11:17:25 -05:00
Mike Place
df5a112a9b
Merge pull request #41904 from twangboy/docs_win_add_firewall
...
Fix anchor to _linux-iptables
2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4
Fix anchor to _linux-iptables
2017-06-22 09:46:29 -06:00
Mike Place
3bc07d2f7c
Line breaks
2017-06-22 09:24:55 -06:00
David Boucha
fd4fdf4952
remove trailing whitespace
2017-06-21 18:37:17 -06:00
David Boucha
64f9cc2409
add put_file
2017-06-21 17:14:21 -06:00
David Boucha
f2129c3c37
add missing function argument
2017-06-21 17:14:20 -06:00
David Boucha
1d39790e9c
add missing function argument
2017-06-21 17:14:19 -06:00
