Kadlec Jan
2c67cfdbdb
Add function for matching key/value grains
2017-03-08 15:14:46 +01:00
Nicole Thomas
418006a109
Merge pull request #39869 from The-Loeki/cache-roster2
...
Cache roster: add release notes
2017-03-07 16:18:43 -07:00
Mike Place
da164bfc22
Minor grammar cleanup
2017-03-07 08:51:29 -07:00
Ronald van Zantvoort
7cd3ac4e78
Cache roster: add release notes
2017-03-07 12:10:34 +01:00
Mike Place
a33b8f81f7
Merge pull request #39843 from s0undt3ch/features/3rd-party-imports
...
Start linting 3rd-party imports
2017-03-06 21:03:16 -07:00
Mike Place
75c02f4e5e
Merge pull request #39840 from ninja-/fix_cron_py3
...
Fix cron for python3
2017-03-06 21:02:57 -07:00
Mike Place
38f7a9a674
Merge pull request #39857 from jettero/profile-tabular-fix
...
when the output is tabular and profiled, nothing lines up right..
2017-03-06 14:52:14 -07:00
Paul Miller
2b1fa1e055
when the output is tabular and profiled, nothing lines up right... :>7 ftw
2017-03-06 15:10:22 -05:00
Nicole Thomas
76adf65880
Merge pull request #39853 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-06 11:44:38 -07:00
Nicole Thomas
102efdbe71
Merge pull request #39844 from dankolbrs/develop
...
Fixes an incredibly small typo in the Django returner docstring
2017-03-06 09:19:10 -07:00
rallytime
a3fe63f972
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-03-06 09:12:01 -07:00
Pedro Algarvio
878e770088
Bump required SaltPyLint version
2017-03-06 15:28:58 +00:00
Pedro Algarvio
303939380d
Disable import-errors
2017-03-06 14:42:32 +00:00
Pedro Algarvio
3ec0870ef6
Disable 3rd-party-module-not-gated
2017-03-06 14:42:31 +00:00
Pedro Algarvio
7dc6b64689
No need to call .keys() when iterating a dictionary
2017-03-06 14:42:31 +00:00
Pedro Algarvio
0da3c1f808
We ship six
2017-03-06 14:35:18 +00:00
Pedro Algarvio
41543bba99
Disable pylint blacklisted-external-module
2017-03-06 14:35:18 +00:00
Pedro Algarvio
ffec7dc299
Lint fixes
2017-03-06 14:35:16 +00:00
Pedro Algarvio
1e167d4042
pytest and pytestsalt should be considered good 3rd-party imports on develop
2017-03-06 14:35:16 +00:00
Pedro Algarvio
dae1025977
This option is now on a disable pylint plugin
2017-03-06 14:35:15 +00:00
Pedro Algarvio
f79ac6690a
We can ignore local imports(to functions/if statements) convention errors.
...
If the users has put those imports within a function body or inside an
if statement, he's probably making sure no `ImportError` is raised.
2017-03-06 14:35:14 +00:00
Pedro Algarvio
6c9152764d
Use tests.support.mock
2017-03-06 14:35:13 +00:00
Pedro Algarvio
140b97ee8b
We need __version__ in the tests.support.mock scope
2017-03-06 14:35:12 +00:00
Pedro Algarvio
d13b40554b
Use the __version__ variable from tests.support.mock
2017-03-06 14:35:12 +00:00
Pedro Algarvio
187da80f4a
Cleanup imports
2017-03-06 01:20:23 +00:00
Pedro Algarvio
d7f05e68ee
Start linting 3rd-party imports
2017-03-06 00:51:19 +00:00
Dan Kolb
876709dcaf
fixes an incredibly small typo in the django returner docstring
2017-03-05 17:06:57 -06:00
ninja-
a32bc2dcb3
Fix 'runas' functionality of cmdmod for python3
2017-03-05 14:30:53 +01:00
ninja-
99ef3647f6
Fix cron module for python3
2017-03-05 14:30:07 +01:00
Pedro Algarvio
5de563bb77
Merge pull request #39806 from cachedout/thin_zip
...
Support the creation of .zip thin file
2017-03-04 19:58:08 +00:00
Mike Place
3341e4e202
Merge pull request #39492 from whiteinge/full_return-arg
...
Add full_return arg to LocalClient and RunnerClient
2017-03-04 09:14:17 -07:00
Mike Place
c10abec6d3
Merge pull request #39797 from twangboy/win_fix_test_git
...
Fix test_worktree_add_rm test for Windows
2017-03-04 09:12:12 -07:00
Mike Place
faffb834a6
Support the creation of .zip thin file
2017-03-04 09:10:07 -07:00
Mike Place
bcc26d2721
Merge pull request #39821 from mitodl/develop
...
Added fix for empty overrides value in apply config methods
2017-03-04 09:04:57 -07:00
Mike Place
cf483d5480
Merge pull request #39825 from terminalmage/fix-docker-timeout
...
Fix regression in docker module when client is spawned
2017-03-04 09:02:48 -07:00
Mike Place
b912af6063
Merge pull request #39829 from moio/minionswarm-delay-starts
...
minionswarm.py: add flag to delay starts
2017-03-04 09:01:28 -07:00
Silvio Moioli
573d6e9dfb
minionswarm.py: add flag to delay starts
2017-03-04 14:52:18 +01:00
Erik Johnson
830c4b8914
Fix regression in docker module when client is spawned
...
PR #39597 broke this module by introducing an UnboundLocalError. This
fixes that error.
2017-03-03 16:19:08 -06:00
Pedro Algarvio
69f1c0fc64
Merge pull request #39822 from s0undt3ch/features/py3
...
A tiny bit more of py3
2017-03-03 22:12:11 +00:00
Pedro Algarvio
44ba96613b
This needs to be done as a PyLint plugin not as this kind of test.
...
It's the only way we can check all code paths of the __virtual__
function.
Regarding the 3rd-party modules gating, we also need to create a pylint
plugin which known what are the hard deps of Salt and will complain on
all other 3rd-party imports.
2017-03-03 20:35:17 +00:00
Pedro Algarvio
f4732d5433
Lint fixes
2017-03-03 19:28:45 +00:00
Pedro Algarvio
adacf4cc28
Don't expect any ordering from sets!!!!!
2017-03-03 18:31:11 +00:00
twangboy
2a6e61a42e
Add encode for Py3 compatability
2017-03-03 10:53:12 -07:00
Pedro Algarvio
08eba84cfb
Upgrade the six library
...
1.10.0
------
- Issue benjaminp/six#122 : Improve the performance of `six.int2byte` on Python 3.
- Pull request benjaminp/six#55 and issue benjaminp/six#99 : Don't add the `winreg` module to `six.moves`
on non-Windows platforms.
- Pull request benjaminp/six#60 and issue benjaminp/six#108 : Add `six.moves.getcwd` and
`six.moves.getcwdu`.
- Pull request benjaminp/six#64 : Add `create_unbound_method` to create unbound methods.
2017-03-03 17:42:36 +00:00
Tobias Macey
4b61671460
Added fix for empty overrides value in apply config methods
...
In `apply_minion_config` and `apply_master_config` there is a call to
`overrides.get` while the `overrides` value still has the potential of
being `None`. Updated the call to be `(overrides or {}).get` to
prevent unwarranted exceptions.
2017-03-03 12:33:41 -05:00
twangboy
54891a57b1
Fix type in second worktree_path
2017-03-03 10:24:28 -07:00
Seth House
2633f70c3a
Add dummy kwarg to WheelClient().cmd_sync() to match mixin
...
At some point these two kwargs should be wired up to match RunnerClient.
2017-03-03 10:13:59 -07:00
Mike Place
be48790927
Merge pull request #39415 from bbinet/gen_thin-absonly
...
Restore support to generate thin tarballs with local packages
2017-03-03 09:18:44 -07:00
Mike Place
d8396e444e
Merge pull request #39494 from mchugh19/conn_updates
...
Allow states to declare _connection_ keys as documented
2017-03-03 09:07:06 -07:00
Mike Place
17986d0977
Merge pull request #39790 from gtmanfred/develop
...
add get_or_set_hash to sdb
2017-03-03 08:23:26 -07:00
