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
82,328 Commits 24 Branches 182 Tags 341 MiB
1c495ced3c
Commit Graph

82328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
1c495ced3c pass cachedir from kwargs in cache 2017-07-03 09:55:19 -06:00
Mike Place
1bdb2f668b Merge pull request #42061 from terminalmage/fix-loader-subdir 
LazyLoader: fix loading module from a subdir
 2017-06-30 17:44:07 -05:00
Mike Place
5b2ae2dd04 Merge pull request #42062 from terminalmage/arch-grains-test 
Add debug logging for grains tests
 2017-06-30 16:58:15 -05:00
Mike Place
ec378c73ff Merge pull request #42020 from terminalmage/toctree-fix 
Add the new docker state modules to the toctree
 2017-06-30 15:58:27 -05:00
Mike Place
9548588c79 Merge pull request #42050 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-30 15:58:01 -05:00
Mike Place
3ee31ea25e Merge pull request #42057 from rallytime/ssh-unit-test 
Add mode back in for tmp file creation on Linux for ssh unit test
 2017-06-30 15:54:23 -05:00
Erik Johnson
e454abc465 Use existing fpath_dirname variable 
This saves a call to os.path.dirname()
 2017-06-30 15:44:19 -05:00
Erik Johnson
3071bb7a37 Add debug logging for grains tests 
The assert doesn't tell us anything about the grain that is failing.
This adds some debug logging to make this easier to troubleshoot.
 2017-06-30 15:39:48 -05:00
Erik Johnson
629d7eb31a LazyLoader: fix loading module from a subdir 
PRs #41937 and #41963 changed the LazyLoader it so that newer Python
releases (>=3.5) usee importlib instead of imp to load modules. However,
when importlib is in use, and the module is being loaded from a
__init__.py, the importlib.machinery.FileFinder instance is created with
the path to the directory containing the __init__.py, which makes it
impossible to find a match for the desired module.

This commit passes the parent dir when instantiating the FileFinder so
that it can properly locate the module.
 2017-06-30 15:11:42 -05:00
rallytime
f0416acc37 Add mode back in for tmp file creation on Linux 
The mode arg was removed in PR #41966 to get this test to pass on
Windows. However, this caused the same test to fail on Arch Linux
when running Python 3.

Let's keep the test the way it was for non-windows boxes, and only
remove the mode for windows.
 2017-06-30 12:06:54 -06:00
rallytime
c98470e557 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-06-30 10:00:10 -06:00
Nicole Thomas
0000f0f975 Merge pull request #42037 from rallytime/nitrogen-doc 
Replace some more "Nitrogen" references with 2017.7.0
 2017-06-30 08:31:37 -06:00
Nicole Thomas
951ed4a9c9 Merge pull request #42032 from terminalmage/py3-tests 
Avoid race condition when iterating through processes
 2017-06-30 08:29:54 -06:00
Mike Place
32b73efd2d Merge pull request #42034 from rallytime/fix-41971 
Add the 'provider' key to salt.cloud.CloudClient.create()
 2017-06-30 09:01:19 -05:00
garethgreenaway
a0b537c8b6 Merge pull request #42026 from twangboy/win_unit_test_roots 
Fix `unit.fileserver.test_roots` for Windows
 2017-06-29 17:53:16 -07:00
rallytime
8cd4f62e87 Replace some more "Nitrogen" references with 2017.7.0 2017-06-29 17:33:37 -06:00
Nicole Thomas
ca4e619edb Merge pull request #42024 from leeclemens/doc/selinux 
doc: Specify versionadded for SELinux policy install/uninstall
 2017-06-29 17:29:49 -06:00
Nicole Thomas
e3e576c636 Merge pull request #42009 from redmatter/fix-dockerng-network-ignores-test-2017.7 
Fix dockerng.network_* ignoring of tests=True
 2017-06-29 15:10:38 -06:00
Seth House
50856d0e28 Merge pull request #42030 from whiteinge/revert-py3-doc-chagnes-pt-2 
Re-add msgpack to mocked imports
 2017-06-29 14:47:59 -06:00
rallytime
3b87dbca12 Add the 'provider' key to salt.cloud.CloudClient.create() 
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.

Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.

Fixes #41971
 2017-06-29 14:38:09 -06:00
rallytime
a77e1bd9dd Add integration test for salt.cloud.CloudClient.create() function 2017-06-29 14:37:12 -06:00
Erik Johnson
d31939574b Avoid race condition when iterating through processes 
If a process has already exited between when psutil.process_iter() was
invoked, and when we invoke the cmdline() func, it will raise an
exception. This commit catches this exception and skips these processes.
 2017-06-29 15:08:17 -05:00
Seth House
18dfa9893c Re-add msgpack to mocked imports 2017-06-29 13:49:45 -06:00
Mike Place
53031d2f55 Merge pull request #42028 from saltstack/revert-41961-py3_doc 
Revert "Allow docs to be built under Python 3"
 2017-06-29 14:47:46 -05:00
Seth House
5592e6e5d4 Revert "Allow docs to be built under Python 3" 2017-06-29 13:32:09 -06:00
twangboy
cdb53c2657 Set file_roots for Windows Temp 2017-06-29 13:01:10 -06:00
Erik Johnson
fae46649e4 Merge pull request #42019 from gtmanfred/docker 
Revert docker documentation from pre nitrogen release that was merged forward.
 2017-06-29 13:49:26 -05:00
Lee Clemens
b63a3c0fae doc: Specify versionadded for SELinux policy install/uninstall 2017-06-29 14:36:25 -04:00
Erik Johnson
bfa9836336 Add the new docker state modules to the toctree 2017-06-29 12:31:58 -05:00
Mike Place
1416bf70b9 Merge pull request #42017 from lorengordon/issue-42013 
Fixes typo "nozerconf" -> "nozeroconf"
 2017-06-29 12:30:48 -05:00
Mike Place
1d552439fe Merge pull request #42016 from terminalmage/pr-41929 
Reopen PR #41929 against 2017.7
 2017-06-29 12:29:21 -05:00
Mike Place
0ebb50b601 Merge pull request #41906 from terminalmage/numeric-saltenv 
Better support for numeric saltenvs
 2017-06-29 12:19:33 -05:00
Daniel Wallace
06b5a8a5b7 Revert "Fix documentation for docker login function in pre-nitrogen release branches" 
This reverts commit dfbbeb5946.
 2017-06-29 11:13:36 -06:00
Mike Place
1b194904f3 Merge pull request #41992 from twangboy/win_unit_test_archive 
Fix `unit.modules.test_archive` on Windows
 2017-06-29 11:53:04 -05:00
Mike Place
d996a82cc4 Merge pull request #42002 from mcalmer/2017.7-fix-kubernetes-serializing 
Fix serialize error when requesting a node
 2017-06-29 11:29:07 -05:00
garethgreenaway
e95f22ab7a Merge pull request #42004 from vutny/2017-7-fix-croniter-scheduled-jobs 
[2017.7] Fix crontab-based Master/Minion scheduled jobs
 2017-06-29 09:19:33 -07:00
Loren Gordon
b6cf5f2528 Fixes typo nozerconf -> nozeroconf 
Fixes #42013
 2017-06-29 11:46:20 -04:00
Erik Johnson
0837a64394 Express multiple examples as an RST list 2017-06-29 10:01:26 -05:00
Erik Johnson
8ed39ba12b Clarify the binds configuration when selinux context is present 2017-06-29 09:57:03 -05:00
Benjamin Schubert
4bce6e160f fixing bad documentation 2017-06-29 09:14:57 -05:00
Benjamin Schubert
15bd41d920 updated documentation for docker bind selinux 2017-06-29 09:14:57 -05:00
Benjamin Schubert
c1600c7a38 udpated docker_container doc for selinux 
The selinux flags for volumes where missing.
 2017-06-29 09:14:57 -05:00
Andrew Bulford
d38199f04f Fix dockerng.network_* ignoring of tests=True 
Fixes #41976
 2017-06-29 13:47:42 +01:00
Denys Havrysh
6f967acdd7 [2017.7] Fix crontab-based Master/Minion scheduled jobs 2017-06-29 12:09:35 +03:00
Michael Calmer
07f82f934e Fix serialize error when requesting a node 2017-06-29 11:00:59 +02:00
Mike Place
9f3438d5e7 Merge pull request #42000 from terminalmage/merge-2017.7 
Merge 2016.11 into 2017.7 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
 2017-06-28 21:44:22 -05:00
Mike Place
03e908070b Merge pull request #41951 from terminalmage/pyobjects-priority 
Introduce "priority" feature for pyobjects
 2017-06-28 21:02:37 -05:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
 2017-06-28 20:27:32 -05:00
Mike Place
6a3c03c2d5 Merge pull request #41995 from terminalmage/token-umask 
Temporarily set the umask before writing an auth token
 2017-06-28 20:09:47 -05:00
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