Sean Jenkins
1d7ee7bed2
Merge remote-tracking branch 'origin/develop' into sean
2015-12-30 08:44:30 -07:00
Sean Jenkins
0ffea31666
Fix lint for PR30062
2015-12-30 08:35:18 -07:00
Sean Jenkins
f6a7aec310
Merge remote-tracking branch 'origin/develop' into sean
2015-12-30 08:21:33 -07:00
Nicole Thomas
cb3645e8b4
Merge pull request #30072 from rallytime/merge-forward-develop
...
Merge branch '2015.8' into 'develop'
2015-12-29 16:56:30 -07:00
rallytime
ef9ecb830f
Use full version notation for versionadded tags in boto_iam.py
2015-12-29 15:52:42 -07:00
rallytime
c386d70742
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/modules/alternatives.py
- salt/modules/boto_rds.py
- salt/modules/mount.py
- salt/states/boto_iam.py
2015-12-29 15:51:12 -07:00
Mike Place
896655602e
Merge pull request #30064 from rallytime/fix-30045
...
Add Syndic documentation to miscellaneous Salt Cloud config options
2015-12-29 13:15:45 -07:00
rallytime
6176f383e5
Spelling fixes
2015-12-29 11:57:18 -07:00
rallytime
83c05729d6
Add Syndic documentation to miscellaneous Salt Cloud config options
...
Fixes #30045
2015-12-29 11:53:49 -07:00
Mike Place
7061661ab6
Merge pull request #30061 from cachedout/rebase_26668_1
...
Rebase #26668
2015-12-29 10:24:34 -07:00
Mike Place
feaef05f95
Rebase and lint of #26668
2015-12-29 10:23:16 -07:00
Sean Jenkins
41353b7ab3
Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead
2015-12-29 10:22:54 -07:00
Mabsou
ea209aaeaa
Add PreRelease as an argument for chocolatey install
2015-12-29 10:21:31 -07:00
Mabsou
f5f5332d05
Solve Unable to determine Chocolatey Version error while executing chocolatey.chocolatey_version
2015-12-29 10:21:30 -07:00
Mike Place
51dd6d9e82
Merge pull request #30050 from twangboy/fix_29552_dev
...
Fixed some grains in for OS X
2015-12-29 10:08:18 -07:00
Mike Place
bad6daca93
Merge pull request #30049 from rallytime/esxi-unit-tests
...
Add some more unit tests for the vsphere execution module
2015-12-29 10:07:41 -07:00
Mike Place
cedee772d7
Merge pull request #30060 from rallytime/bp-27104
...
Back-port #27104 to 2015.8
2015-12-29 10:06:58 -07:00
Mike Place
0393b153ee
Merge pull request #29957 from skizunov/develop2
...
Fix more logger related memory leaks on Windows
2015-12-29 10:06:29 -07:00
Mike Place
e915f4b591
Merge pull request #30053 from akissa/add-postgres-privileges-support
...
Add postgres privileges support
2015-12-29 09:50:44 -07:00
Mike Place
289cf5a160
Merge pull request #30054 from thusoy/ipt-dead-code
...
Remove dead code from iptables
2015-12-29 09:25:27 -07:00
Mike Place
05c2931b11
Merge pull request #30055 from akissa/add-postgres-language-ref-docs
...
add postgres_language state module documentation
2015-12-29 09:24:46 -07:00
Mike Place
ea0c7dc3fc
Merge pull request #30056 from DSRCompany/bugs/30044_redis_return
...
Skip non-existing jobs in redis return.
2015-12-29 09:24:28 -07:00
Mike Place
cbde20093a
Merge pull request #30058 from abednarik/virtual_ret_pam_module
...
modules.pam: __virtual__ return err msg.
2015-12-29 09:21:14 -07:00
William Huba
f0566c4b8f
Remove only the file extension on cached node files instead of replacing every '.p' substring.
2015-12-29 09:21:12 -07:00
abednarik
dcf16a6630
modules.pam: __virtual__ return err msg.
...
Updated message when pam is not present.
2015-12-29 09:43:39 -03:00
Dmitry Kuzmenko
745bfbade6
Skip non-existing jobs in redis return.
2015-12-29 15:32:22 +03:00
Tarjei Husøy
379b3eca1e
Remove dead code from iptables
2015-12-29 13:12:18 +01:00
Andrew Colin Kissa
8066a06191
add postgres_language state module documentation
2015-12-29 13:13:37 +02:00
Andrew Colin Kissa
d27f0cc88a
add postgres_privileges ref docs
2015-12-29 13:02:56 +02:00
Andrew Colin Kissa
7be5eebfc7
add postgres_privileges state module tests
2015-12-29 12:57:21 +02:00
Andrew Colin Kissa
0a0b3985c1
fix keyword argument after normal arguments
...
improved the module return comments
2015-12-29 12:55:51 +02:00
Andrew Colin Kissa
259ca0fd2d
doc format
2015-12-29 12:04:24 +02:00
Andrew Colin Kissa
b748e9e6b3
added postgres_privileges state module
2015-12-29 12:00:39 +02:00
Andrew Colin Kissa
9fc089fab6
refactored to make lint happy
2015-12-29 11:59:51 +02:00
Andrew Colin Kissa
efcfb611b2
added postgres execution privileges tests
2015-12-29 10:59:48 +02:00
Andrew Colin Kissa
4b1fa84d11
made privileges param optional as some objects do
...
not need it such as group
refactored code for DRY
added the admin_option boolean to enable group admin
checking
2015-12-29 10:54:49 +02:00
Andrew Colin Kissa
dd94b62030
remove function privileges for now
2015-12-29 08:50:44 +02:00
Andrew Colin Kissa
9c98a8efa1
refactored to use map instead of multi if branches
...
refactored validation to check for specific object types
added support for grant option in privilege listing
added support for grant option in privilege checks
2015-12-29 08:48:28 +02:00
jacobhammons
f0e714a0c7
Merge pull request #30046 from jacobhammons/spm-docs
...
updated spm docs
2015-12-28 17:26:42 -07:00
Mike Place
87667e2de6
Merge pull request #30048 from jacobhammons/28540
...
Remove internal APIs from rest_cherrypy docs.
2015-12-28 16:24:13 -07:00
twangboy
908e10d791
Added osfamily, changed some names
2015-12-28 16:23:55 -07:00
rallytime
1a83147986
Remove unnecessary import block
2015-12-28 16:14:13 -07:00
rallytime
695107ae6e
Add some more unit tests for the vsphere execution module
...
And fix a coupl of small bugs found in the module through testing
2015-12-28 16:11:33 -07:00
twangboy
2fad3d56a6
Added function to get additional platform data for grains in osx
2015-12-28 15:32:35 -07:00
Jacob Hammons
a04cebd48c
Remove internal APIs from rest_cherrypy docs.
...
Refs #28540
2015-12-28 15:26:16 -07:00
Mike Place
5cfda08b39
Merge pull request #29970 from sjorge/module-zfs
...
salt.modules.zfs
2015-12-28 14:38:37 -07:00
Mike Place
3c63527313
Merge pull request #30043 from rallytime/fix-29960
...
Be explicit about importing from salt.utils.jinja to avoid circular imports
2015-12-28 14:35:18 -07:00
Jacob Hammons
32a352120a
updated spm docs
2015-12-28 14:29:02 -07:00
Mike Place
28e01aa8ac
Merge pull request #30018 from gladiatr72/pip_state__handle_requirements_chaining
...
Pip module/state -- handle requirements chaining
2015-12-28 14:28:00 -07:00
Mike Place
b35769f5f8
Merge pull request #29965 from mephi42/develop
...
Tolerate unimplemented service.enabled in salt/states/service.py
2015-12-28 14:05:01 -07:00
