Commit Graph

77669 Commits

Author SHA1 Message Date
Dmitry Kuzmenko
e721c7eee2 Don't use key in weakvaluedict because it could lie.
Example:
```python
import weakref

class O(object):
    pass

d = weakref.WeakValueDictionary()
key = 'key'
value = O()
d[key] = value
d[key]  # <O object at 0x...>
del value
key in d  # True
d.get(key)  # None
```
2017-07-19 13:21:29 +03:00
Nicole Thomas
016189f62f Merge pull request #42370 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-07-18 16:39:40 -06:00
rallytime
0aa5dde1de Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/conf.py
2017-07-18 13:45:29 -06:00
Nicole Thomas
e9b0f20f8a Merge pull request #42359 from Ch3LL/doc-update-2016.3
[2016.3] Update version numbers in doc config for 2017.7.0 release
2017-07-18 13:23:35 -06:00
Nicole Thomas
f06a6f1796 Merge pull request #42360 from Ch3LL/doc-update-2016.11
[2016.11] Update version numbers in doc config for 2017.7.0 release
2017-07-18 13:23:29 -06:00
Nicole Thomas
e0595b0a0f Merge pull request #42319 from rallytime/config-docs
Add more documentation for config options that are missing from master/minion docs
2017-07-18 12:02:31 -06:00
twangboy
a7c910c31e Remove build and dist directories before install 2017-07-18 11:36:38 -06:00
Nicole Thomas
78940400e3 Merge pull request #42352 from CorvinM/issue42333
Multiple documentation fixes
2017-07-18 09:10:36 -06:00
Nicole Thomas
b256001760 Merge pull request #42353 from terminalmage/fix-git-test
is_windows is a function, not a propery/attribute
2017-07-18 08:38:50 -06:00
Pablo Suárez Hernández
915d94219e Allow to check whether a function is available on the AliasesLoader wrapper 2017-07-18 12:57:36 +01:00
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute
While not fatal, this could potentially cause problems running this
test on Windows.
2017-07-17 23:36:21 -05:00
Corvin Mcpherson
526b6ee14d Multiple documentation fixes
The master config 'engines' option takes a list of engines
but will accept a single engine instead of the list but adds
a warning that it requires a list. The documentation for some
of the engine modules pass a single engine instead of a list
of engines. This commit fixes the documentation of these engine
modules to give correct usage of the 'engines' option.

Fixes #42333

Additionally, A few of the documentation pages were missing
code-blocks where they were needed to ensure proper formatting.
This commit adds the code blocks where they were missing in the
engine modules documentation.
2017-07-17 19:10:15 -04:00
twangboy
8c048403d7 Detect Server OS with a desktop release name 2017-07-17 14:58:16 -06:00
Ch3LL
b90b7a7506 [2016.11] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:54:46 -04:00
Ch3LL
dc85b5edbe [2016.3] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:50:54 -04:00
Mike Place
866a1febb4 Merge pull request #42264 from rallytime/fix-41116
Update minion restart section in FAQ doc for windows
2017-07-17 12:40:39 -05:00
Mike Place
9a707088ad Merge pull request #42275 from terminalmage/issue42194
pkg.installed: pack name/version into pkgs argument
2017-07-17 12:38:38 -05:00
Mike Place
e588f235e0 Merge pull request #42269 from rallytime/fix-41721
Add some clarity to "multiple quotes" section of yaml docs
2017-07-17 12:38:17 -05:00
Mike Place
5aaa214a75 Merge pull request #42282 from rallytime/fix-42152
Handle libcloud objects that throw RepresenterErrors with --out=yaml
2017-07-17 12:36:34 -05:00
Mike Place
fb5697a4bc Merge pull request #42308 from lubyou/42295-fix-file-absent-windows
Force file removal on Windows. Fixes #42295
2017-07-17 12:12:12 -05:00
Mike Place
da2a8a518f Merge pull request #42314 from rallytime/fix-42267
Add clarification to salt ssh docs about key auto-generation.
2017-07-17 09:07:49 -05:00
Bo Maryniuk
bbba84ce2d Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125) 2017-07-17 16:01:53 +02:00
rallytime
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -06:00
rallytime
c406046940 Add clarification to salt ssh docs about key auto-generation.
Fixes #42267
2017-07-14 11:57:58 -06:00
Nicole Thomas
acadd54013 Merge pull request #41945 from garethgreenaway/41936_allow_identity_files_with_user
Fixes to modules/git.py
2017-07-14 11:46:10 -06:00
Nicole Thomas
f90e04a2bc Merge pull request #42289 from CorvinM/bp-41543
Multiple empty_password fixes for state.user
2017-07-14 10:14:01 -06:00
Johannes Scholz
026ccf401a Force file removal on Windows. Fixes #42295 2017-07-14 15:55:23 +02:00
Erik Johnson
663874908a pkg.installed: pack name/version into pkgs argument
This allows a version of 'latest' to work when just a name and version
is passed.
2017-07-13 13:04:09 -05:00
Nicolas Geniteau
357dc22f05 Fix user creation with empty password
Emptying the password was only done if the user already existed, not
when creating.

Signed-off-by: Nicolas Geniteau <nicolas@cri.epita.net>
2017-07-13 12:32:15 -04:00
rallytime
f2250d474a Add a note about using different styles of quotes. 2017-07-12 17:08:23 -06:00
rallytime
f032223843 Handle libcloud objects that throw RepresenterErrors with --out=yaml
Fixes #42152
2017-07-12 14:19:35 -06:00
Nicole Thomas
a91a3f81b1 Merge pull request #42123 from vutny/fix-master-utils-import
DOCS: describe importing custom util classes
2017-07-12 09:53:23 -06:00
rallytime
bd638880e3 Add mono-spacing to salt-minion reference for consistency 2017-07-12 09:36:07 -06:00
Denys Havrysh
6bb8b8f98c Add missing doc for `utils_dirs` Minion config option 2017-07-12 11:08:34 +03:00
Denys Havrysh
f1bc58f6d5 Utils: add example of module import 2017-07-12 11:08:34 +03:00
Denys Havrysh
d1f2a93368 DOCS: unify hash sum with hash type format 2017-07-12 11:03:34 +03:00
rallytime
38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs
Fixes #41721
2017-07-11 17:28:45 -06:00
Nicole Thomas
e2aa5114e4 Merge pull request #42261 from rallytime/minor-doc-fix
Some minor doc fixes for dnsutil module so they'll render correctly
2017-07-11 17:14:53 -06:00
Nicole Thomas
3e9dfbc9cc Merge pull request #42262 from rallytime/bp-42224
Back-port #42224 to 2016.11
2017-07-11 17:14:24 -06:00
rallytime
30d62f43da Update minion restart section in FAQ doc for windows
Fixes #41116
2017-07-11 16:24:29 -06:00
Thomas Dutrion
c31ded341c Remove duplicate instruction in Openstack Rackspace config example 2017-07-11 16:01:15 -06:00
rallytime
8c76bbb53d Some minor doc fixes for dnsutil module so they'll render correctly 2017-07-11 15:57:32 -06:00
Nicole Thomas
7780579c36 Merge pull request #42181 from garethgreenaway/42137_backport_fix_from_2017_7
fixes to state.py for names parameter
2017-07-11 15:21:31 -06:00
Nicole Thomas
72537868a6 Merge pull request #42253 from gtmanfred/2016.11
Only use unassociated ips when unable to allocate
2017-07-11 14:53:50 -06:00
Nicole Thomas
b2a4698b5d Merge pull request #42252 from UtahDave/2016.11local
simple docstring updates
2017-07-11 14:48:32 -06:00
Daniel Wallace
53e25760be Only use unassociated ips when unable to allocate
When checking the unassociated ips first, in Parallel mode, each server will
use the same one unallocated ip.
2017-07-11 10:47:16 -06:00
David Boucha
e6a9563d47 simple doc updates 2017-07-11 10:19:22 -06:00
Nicole Thomas
781fe13be7 Merge pull request #42235 from astronouth7303/patch-1-2016.3
Abolish references to `dig` in examples.
2017-07-10 14:06:11 -06:00
Jamie Bliss
4cb51bd03a Make note of dig partial requirement. 2017-07-10 13:55:06 -04:00
Jamie Bliss
08e7d8351a Abolish references to dig in examples. 2017-07-10 13:53:12 -04:00