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
77,699 Commits 24 Branches 182 Tags 341 MiB
27a8a2695a
Commit Graph

77699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume DUBROEUCQ
d2ef4483e4 yumpkg.py: clean 2017-07-27 15:07:10 +02:00
Guillaume DUBROEUCQ
a96f7c09e0 yumpkg.py: add option to the command "check-update" 2017-07-27 14:34:56 +02:00
C. R. Oldham
e931ed2517 Merge pull request #42571 from twangboy/win_add_pythonpath 
Avoid loading system PYTHON* environment vars
 2017-07-26 16:48:55 -06:00
twangboy
d55a44dd1a Avoid loading user site packages 2017-07-26 14:21:41 -06:00
Erik Johnson
0293429e24 Only force saltenv/pillarenv to be a string when not None 
This fixes a regression introduced to make numeric saltenv/pillarenv
work properly.
 2017-07-26 13:58:31 -06:00
twangboy
9af1eb2741 Ignore any PYTHON* environment vars already on the system 2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95 Add pythonpath to batch files and service 2017-07-26 12:21:14 -06:00
Richard Phillis
c4fabaa192 Remove '-s' (--script) argument to parted within align_check function 
The -s argument results in no stdout output from parted in this context,
so the user must infer success or failure from the exit status.
 2017-07-26 09:15:59 +10:00
Mike Place
de2f397041 Merge pull request #42387 from DSRCorporation/bugs/42371_KeyError_WeakValueDict 
Fix race condition in usage of weakvaluedict
 2017-07-25 15:57:42 -05:00
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -06:00
Mike Place
641a9d7efd Merge pull request #41968 from root360-AndreasUlm/fix-rabbitmqctl-output-handler 
Fix rabbitmqctl output sanitizer for version 3.6.10
 2017-07-25 14:12:36 -05:00
Mike Place
66fede378a Merge pull request #42479 from gtmanfred/interface 
validate ssh_interface for ec2
 2017-07-25 13:37:18 -05:00
Mike Place
a925c7029a Merge pull request #42516 from rallytime/fix-42405 
Add info about top file to pillar walk-through example to include edit.vim
 2017-07-25 12:01:12 -05:00
twangboy
af3bcc927b Document changes to Windows Update in 10/2016 2017-07-24 14:34:09 -06:00
rallytime
fa466519c4 Add a mention of the True/False returns with __virtual__() 
And their relationship to `__virtualname__`.

Fixes #42375
 2017-07-24 13:58:16 -06:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim 
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
 2017-07-24 12:17:41 -06:00
Daniel Wallace
c32c1b2803 fix pylint 2017-07-24 11:31:25 -06:00
Nicole Thomas
1bd5bbccc2 Merge pull request #42509 from clem-compilatio/fix-42417 
Fix _assign_floating_ips in openstack.py
 2017-07-24 11:14:12 -06:00
clem-compilatio
72924b06b8 Fix _assign_floating_ips in openstack.py 
Fixes #42417
In salt/cloud/clouds/openstack.py :
- _assign_floating_ips() should not raise SaltCloudSystemExit() just yet.
- Instead, it should let _query_node_data() a chance to get the IP from node['public_ips'].
 2017-07-24 16:59:19 +02:00
Mike Place
4bf35a74de Merge pull request #42464 from garethgreenaway/2016_11_remove_tmp_identity_file 
[2016.11] Small fix to modules/git.py
 2017-07-21 16:28:56 -05:00
Daniel Wallace
99ec634c6b validate ssh_interface for ec2 
and default to public_ips
 2017-07-21 15:19:31 -06:00
Gareth J. Greenaway
ff24102d51 Uncomment the line that removes the temporary identity file. 2017-07-21 10:01:55 -07:00
Nicole Thomas
e2120dbd0e Merge pull request #42443 from garethgreenaway/42357_pass_args_kwargs_correctly 
[2016.11] Fix to slack engine
 2017-07-21 09:48:56 -06:00
Nicole Thomas
8262cc9054 Merge pull request #42200 from shengis/sqlite3_fix_row_absent_2016.11 
Fix #42198
 2017-07-21 08:47:29 -06:00
Gareth J. Greenaway
635810b3e3 Updating the slack engine in 2016.11 to pass the args and kwrags correctly to LocalClient 2017-07-20 16:50:42 -07:00
Mike Place
d9df97e5a3 Merge pull request #42424 from goten4/2016.11 
Fix error message when tornado or pycurl is not installed
 2017-07-20 16:53:40 -05:00
Emmanuel Bouton
1c0574d05e Fix error message when tornado or pycurl is not installed 2017-07-20 17:01:10 +02:00
Mike Place
42bb1a64ca Merge pull request #42350 from twangboy/win_fix_ver_grains_2016.11 
Fixes problem with Version and OS Release related grains on certain versions of Python (2016.11)
 2017-07-19 12:07:25 -05:00
Mike Place
0a72e56f6b Merge pull request #42356 from meaksh/2016.11-AliasesLoader-wrapper-fix 
Allow to check whether a function is available on the AliasesLoader wrapper
 2017-07-19 11:56:41 -05:00
Mike Place
10eb7b7a79 Merge pull request #42368 from twangboy/win_fix_build_2016.11 
Remove build and dist directories before install (2016.11)
 2017-07-19 11:47:27 -05:00
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