valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,533 Commits 24 Branches 182 Tags 341 MiB
b78f179b19
Commit Graph

83533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
garethgreenaway
e3801b0e78 Merge pull request #41999 from terminalmage/fix-network-test 
Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips
 2017-06-28 18:01:30 -07:00
Erik Johnson
a7f38929cb Merge pull request #41991 from Da-Juan/fix-state_aggregate-list 
Accept a list for state_aggregate global setting
 2017-06-28 19:58:59 -05:00
Erik Johnson
7424f879a3 Merge pull request #41993 from UtahDave/2016.11local 
change out salt support link to SaltConf link
 2017-06-28 19:55:19 -05:00
Erik Johnson
94316114ee Add test for pyobjects priority 2017-06-28 19:48:46 -05:00
Erik Johnson
dfd0e51794 Update test_map to test declarative ordering 2017-06-28 19:48:46 -05:00
Erik Johnson
91576a7263 Introduce "priority" feature for pyobjects 
When there are multiple matches (such as when both an os_family and os
grain both match the minion), the order in which they are processed is
determined by the iteration order of the class' __dict__ attribute.
Since this would be different in different versions of Python, behavior
would be inconsistent depending on which version of Python is being used.

This adds a priority attribute to the Map subclass which, if present,
will re-order the match groups such that the results will be predictable
irrespective of Python version.
 2017-06-28 19:48:46 -05:00
Erik Johnson
fb6a93314f Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips 
The IP for saltstack.com changed, so this test needs to be updated.
 2017-06-28 19:42:52 -05:00
Nicole Thomas
8ed53b818e Merge pull request #41989 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-28 17:12:00 -06:00
Erik Johnson
4f54b0069f Temporarily set the umask before writing an auth token 2017-06-28 17:07:27 -05:00
twangboy
bf20938f11 Fixes problem with path 2017-06-28 15:02:12 -06:00
David Boucha
bff050ad52 change out salt support link to SaltConf link 2017-06-28 14:54:01 -06:00
Da-Juan
c9075b8f84 Accept a list for state_aggregate setting 
See #18659
 2017-06-28 22:31:06 +02:00
Nicole Thomas
3b9ccf09d7 Merge pull request #41987 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-28 14:19:10 -06:00
Nicole Thomas
768339d734 Merge pull request #41985 from rallytime/bp-41780 
Back-port #41780 to 2016.11
 2017-06-28 14:18:56 -06:00
Nicole Thomas
bd9090c0bf Merge pull request #41986 from rallytime/bp-41820 
Back-port #41820 to 2016.11
 2017-06-28 14:18:42 -06:00
rallytime
3c823109a1 Lint: Remove extra blank line 2017-06-28 13:29:31 -06:00
rallytime
9cb9547bc0 Rename transport_test file to test_transport and update imports for pytest 2017-06-28 11:35:13 -06:00
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
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
garethgreenaway
a31da52635 Merge pull request #41973 from vutny/fix-croniter-scheduled-jobs 
Fix Master/Minion scheduled jobs based on Cron expressions
 2017-06-28 09:39:01 -07:00
rallytime
48867c4a82 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-06-28 10:29:35 -06:00
Neile Havens
72320e35b9 Fix yum repo file comments to work as documented in pkgrepo.managed 2017-06-28 10:27:23 -06:00
Brian Harring
8f8d3a473a Fix salt.util.render_jinja_tmpl usage for when not used in an environment. 
The previous code tried passing the context (variable definitions) as the
searchpath.  This is grossly wrong; in addition, it was overriding the
encoding directive with the dirpath of the template.

End result, this wasn't usable.

This pathway shouldn't be used often- in my usage, I'm triggering it purely
because I'm using salt's rendering functionality in a nonstandard way (
validation and testing), so this while previously broken, was unlikely
to have been seen by anyone else.
 2017-06-28 10:25:48 -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
Nicole Thomas
689ff93349 Merge pull request #41980 from Ch3LL/11.6_11 
[2016.11] Bump latest release version to 2016.11.6
 2017-06-28 09:35:10 -06:00
Nicole Thomas
c589eae03f Merge pull request #41981 from Ch3LL/11.6_3 
[2016.3] Bump latest release version to 2016.11.6
 2017-06-28 09:34:48 -06:00
Ch3LL
2516ae1349 [2016.3] Bump latest release version to 2016.11.6 2017-06-28 11:24:57 -04:00
Ch3LL
fe4f5711d5 [2016.11] Bump latest release version to 2016.11.6 2017-06-28 11:24:17 -04: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
Denys Havrysh
148788e652 Fix Master/Minion scheduled jobs based on Cron expressions 2017-06-28 09:26:03 +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
garethgreenaway
82b1eb28ab Merge pull request #41961 from cachedout/py3_doc 
Allow docs to be built under Python 3
 2017-06-27 14:11:53 -07: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
f0eb51df17 Merge pull request #41948 from davidjb/patch-9 
Fix Composer state's `name` docs; formatting
 2017-06-27 12:51:28 -05:00
Mike Place
7aacddf6ef
Allow docs to be built under Python 3 2017-06-27 11:46:47 -06: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