valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,441 Commits 24 Branches 182 Tags 341 MiB
e512a29f08
Commit Graph

83441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
Mike Place
aeb82f0829 Merge pull request #41970 from skizunov/develop4 
Implement copy/deepcopy for ContextDict
 2017-06-28 11:19:12 -05:00
Nicole Thomas
84a0f4397b Merge pull request #41979 from Ch3LL/11.6_develop 
[develop] Bump latest release version to 2016.11.6
 2017-06-28 10:05:35 -06:00
Mike Place
40161ec111 Merge pull request #41963 from skizunov/develop3 
PY3: Don't use importlib.util.module_from_spec in PY3.4
 2017-06-28 10:59:13 -05:00
Mike Place
7e3407f90a Merge pull request #41958 from DSRCorporation/bugs/py3_test_map 
Pyobjects Map: prioritize grains by declaration order.
 2017-06-28 10:57:59 -05:00
Ch3LL
0f5d5667cf [develop] Bump latest release version to 2016.11.6 2017-06-28 11:23:07 -04:00
garethgreenaway
4fe273f78e Merge pull request #41969 from twangboy/win_unit_test_config 
Fix `unit.config.test_config` for Windows
 2017-06-28 08:18:07 -07:00
garethgreenaway
7c96200e42 Merge pull request #41967 from twangboy/win_unit_test_api 
Fix `unit.config.test_api` for Windows
 2017-06-28 08:17:21 -07:00
garethgreenaway
750409f3eb Merge pull request #41966 from twangboy/win_unit_test_ssh 
Fix `unit.modules.test_ssh` for Windows
 2017-06-28 08:16:31 -07:00
Dmitry Kuzmenko
bbfda8792a Properly handle declaration order and grains match in pyobjects.Map. 2017-06-28 18:01:27 +03:00
Sergey Kizunov
599beeed39 Implement copy/deepcopy for ContextDict 
There is a use case that causes this error:

```
[WARNING ] The minion function caused an exception: can't pickle
_thread._local objects
```

It happens when `salt.modules.state._get_opts` is invoked and it is
running this line of code:

```
opts = copy.deepcopy(__opts__)
```

It occurs because the `grains` in `__opts__` happens to be a
`NamespacedDictWrapper` with the internal `self.__dict` happening
to be a `ContextDict`. Implementing deepcopy for `ContextDict` fixes
this error.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-27 20:26:19 -05:00
twangboy
98bc208db9 Fix paths, skip impossible 2017-06-27 17:31:23 -06:00
twangboy
1f497d8f78 Fix paths 2017-06-27 16:43:54 -06:00
twangboy
3eca45e000 Fix unit tests for ssh 2017-06-27 15:29:44 -06:00
Mike Place
4209be843d Merge pull request #41959 from DSRCorporation/bugs/minor_dict_diff_enhance 
Minor dict diff enhance in tests.
 2017-06-27 15:18:16 -05:00
Sergey Kizunov
55a18b5106 PY3: Don't use importlib.util.module_from_spec in PY3.4 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-27 14:18:20 -05:00
Mike Place
f9965ccfcb Merge pull request #41939 from cachedout/mdadm_py3_test 
Gate assert check behind mock ver
 2017-06-27 13:04:23 -05:00
Mike Place
c8adebcf55 Merge pull request #41960 from skizunov/develop3 
PY3: Fix importlib usage to use fullname
 2017-06-27 12:53:28 -05:00
Mike Place
0b70ed7d06 Merge pull request #41913 from twangboy/win_servermanager 
Win servermanager
 2017-06-27 12:46:11 -05:00
Mike Place
e3bfd5a593 Merge pull request #41952 from meaksh/2017.7-suse-leftovers-part-two 
Fix "zypp_plugins" unit test for Python 3
 2017-06-27 12:42:00 -05:00
Sergey Kizunov
b30ed52f74 PY3: Fix importlib usage to use fullname 
When a module wasn't loaded using fullname, it wouldn't be able to
find the module by function since `<funcname>.__module__` wouldn't
match what is in `syspaths.modules`. Due to this, calling module functions
on the command line wouldn't work. Fixed this issue. Also optimized usage
of importlib by switching to the `importlib.util.spec_from_file_location`
API.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-06-27 09:48:18 -05:00
Mike Place
dbead7245a Merge pull request #41938 from terminalmage/py3-tests 
Use a custom dumper to ensure defaultdict and odict work
 2017-06-27 09:22:38 -05:00
Dmitry Kuzmenko
e01e566779 Minor: show full dict diffs if test fails. 2017-06-27 16:22:09 +03:00
Dmitry Kuzmenko
a0e787ecc2 Pyobjects Map: prioritize grains by declaration order. 
So the Map from the example would work as expected: later declared
overrides the previous one.
 2017-06-27 15:50:59 +03:00
Pablo Suárez Hernández
7affbce83a Fix zypp_plugins unit test for Python 3 2017-06-27 09:26:35 +01:00
Mike Place
fc0c98c4fe Merge pull request #41937 from skizunov/develop3 
PY3.6: Eliminate `imp` module DeprecationWarning
 2017-06-26 16:23:12 -05:00
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
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
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
garethgreenaway
39397316cc Merge pull request #41867 from onlyanegg/datadog_execution_module 
Datadog execution module
 2017-06-24 08:00:25 -07:00
Ch3LL
9a4b3dbaba Fix some formatting 2017-06-23 18:46:25 -04:00
garethgreenaway
e66b0cda87 Merge branch 'develop' into datadog_execution_module 2017-06-23 15:46:12 -07:00
Ch3LL
73271ce94d Add vmware test to check new disk on seperate datastore 2017-06-23 18:36:50 -04:00
twangboy
b2c13654ac Fix unit tests 2017-06-23 15:57:47 -06:00
twangboy
46924be8d3 Fix some lint 2017-06-23 15:25:45 -06: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
f0429ba0c6 Merge pull request #41820 from nhavens/develop 
Fix yum repo file comments to work as documented in pkgrepo.managed
 2017-06-23 11:55:43 -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