Arthur Lutz
b78f179b19
[doc] Update aws.rst : typo fix
2017-07-04 14:21:11 +02:00
Mike Place
63fe8ff59f
Merge pull request #41953 from yagnik/develop
...
Fix loader to point to custom loader as opposed to base loader
2017-07-03 16:58:32 -05:00
Mike Place
899fb6fc94
Merge pull request #42073 from glynnforrest/system-molly-guard-doc
...
Add note to system module about wrapper scripts preventing shutdown
2017-07-03 10:53:39 -05:00
Glynn Forrest
64fda9f331
Add note to system module about wrapper scripts preventing shutdown
...
Fixes #42010
2017-07-02 07:51:56 +01:00
Mike Place
286eaf9237
Merge pull request #42059 from pgporada/fix-grammar
...
Fixes grammar
2017-06-30 16:08:17 -05:00
Mike Place
e7bd8468ba
Merge pull request #42011 from steverweber/dev_autodoc
...
add module and state to help create txt docs from highstate data
2017-06-30 16:03:16 -05:00
Mike Place
d36f0ec0f0
Merge pull request #42051 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-06-30 15:54:53 -05:00
Phil Porada
07f5c64bc7
Fixes grammar
2017-06-30 15:31:36 -04:00
Steve Weber
03bde5a10e
Merge branch 'develop' into dev_autodoc
2017-06-30 14:51:33 -04:00
Mike Place
f1c46ef5c4
Merge pull request #42035 from rallytime/cloud-test-cleanup
...
Add generate_random_name function to tests helpers
2017-06-30 11:39:20 -05:00
rallytime
9227a1263d
Merge branch '2017.7' into 'develop'
...
No conflicts.
2017-06-30 10:00:01 -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
rallytime
80f53cd98c
Replace cloud test __random_name funcs with new generate_random_name helper
2017-06-29 16:11:07 -06:00
rallytime
4a7073ac79
Add generate_random_name function to tests helpers
...
This function is used identically in every cloud provider test file. Let's add
it to a more central place and make it more DRY. Might be useful in other testing
places as well.
2017-06-29 15:43:03 -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
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
Mike Place
37bf1486e2
Merge pull request #42018 from cloudflare/out-exec-mod
...
Out execution module
2017-06-29 14:08:43 -05:00
Steve Weber
4dd3423054
Merge branch 'develop' into dev_autodoc
2017-06-29 15:03:06 -04: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
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
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
Mircea Ulinic
988ddc8218
rst not md
2017-06-29 17:10:20 +00:00
Mircea Ulinic
66fc85abf6
Out mod autodoc
2017-06-29 17:01:53 +00:00
Mircea Ulinic
f89408cefa
Out execution module
2017-06-29 16:59:54 +00: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
s8weber
6573eb0493
add module and state to help create txt docs from highstate data
2017-06-29 12:51:02 -04: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
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
Nicole Thomas
862b2b37cf
Merge pull request #42001 from terminalmage/merge-develop
...
Merge 2017.7 into develop
2017-06-29 08:04:56 -06: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
Erik Johnson
9a50e7c1ca
Merge remote-tracking branch 'upstream/2017.7' into merge-develop
2017-06-28 22:10:50 -05:00
Erik Johnson
68c84a28bc
Merge pull request #41990 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-06-28 22:09:14 -05: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
