rallytime
e2b0fee57e
Don't change perms list, only existing perms should be a dictionary.
...
Refs #28269
2015-11-11 12:31:51 -07:00
Colton Myers
1e510be55b
Merge pull request #28768 from mrosedale/2015.8
...
2015.8
2015-11-11 12:29:11 -07:00
rallytime
7601647d69
Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list."
...
This reverts commit 07482211eb
2015-11-11 12:23:17 -07:00
Mark Rosedale
fbbbdcc02e
Update puppet.py
2015-11-11 13:38:28 -05:00
Mike Place
a6cad46301
Merge pull request #28772 from rallytime/rabbitmq-user-state
...
rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list.
2015-11-11 11:17:09 -07:00
Mike Place
d570ac48f4
Merge pull request #28774 from rallytime/bp-28725
...
Back-port #28725 to 2015.8
2015-11-11 11:16:27 -07:00
Nicole Thomas
8f1d0b636e
Merge pull request #28776 from rallytime/bp-28740-2015.5
...
Back-port #28740 to 2015.5
2015-11-11 11:02:03 -07:00
Nicole Thomas
76e69b4bff
Merge pull request #28777 from rallytime/bp-28740-2014.7
...
Back-port #28740 to 2014.7
2015-11-11 11:00:00 -07:00
Nicole Thomas
806d1b3669
Merge pull request #28775 from rallytime/bp-28740
...
Back-port #28740 to 2015.8
2015-11-11 10:57:24 -07:00
Mike Place
f273c46f07
Merge pull request #28755 from rallytime/vmware-utils
...
Move most vmware driver list_* functions to use salt.utils.vmware functions
2015-11-11 10:49:15 -07:00
Jarrod Moore
da5fac2b36
Back-port #28740 to 2014.7
2015-11-11 10:09:37 -07:00
Jarrod Moore
49256b7d90
Back-port #28740 to 2015.5
2015-11-11 10:07:06 -07:00
Jarrod Moore
8a2780da18
Add missing S3 module import
...
In the get_url method, a salt.utils.s3.query method call is made, but this won't work unless the salt.utils.s3 module is imported. This missing line breaks file.managed resources where source and source_hash attributes use s3:// URLs.
2015-11-11 10:03:20 -07:00
Quan Tong Anh
c3420461c3
boto_vpc: return an empty dict in case cannot get the route tables
2015-11-11 10:01:16 -07:00
rallytime
07482211eb
rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list.
...
Refs #28269
2015-11-11 09:45:35 -07:00
Mike Place
0d912bf0d4
Merge pull request #28744 from jfindlay/elementttree
...
import gate elementtree
2015-11-11 09:29:12 -07:00
Mike Place
b65e786351
Merge pull request #28758 from jfindlay/user
...
remove redundant logic in useradd execution module
2015-11-11 09:22:21 -07:00
Justin Findlay
6eced26013
Merge pull request #28757 from mbarrien/fix-pip-cmd
...
Bug fix: pip command to not quote spaces in cmd line args
2015-11-11 09:08:45 -07:00
Mark Rosedale
1c1a4b4410
Update puppet.py
...
Fix pylint errors.
2015-11-11 11:07:05 -05:00
Mike Place
356bf2987d
Merge pull request #28764 from multani/fix/docs
...
Various documentation fixes
2015-11-11 09:06:09 -07:00
Seth House
77d4b980f1
Merge pull request #28760 from dmyerscough/28732-Fix-cherrypi-api-keys-endpoint
...
Fixing CherryPy key bug
2015-11-11 08:11:18 -07:00
mrosedale
59bd6aef5c
Merge pull request #1 from mrosedale/mrosedale-patch-1
...
Update puppet.py
2015-11-11 09:49:02 -05:00
mrosedale
c26ea916aa
Update puppet.py
...
Update that fixes #28692 where puppet.noop results in an empty puppet run or when providing arguments to puppet.run without setting agent as the first argument results in an empty puppet run.
2015-11-11 09:47:01 -05:00
Jonathan Ballet
1a31b69763
doc: fix documentation formatting in salt.utils.jinja
2015-11-11 12:01:10 +01:00
Jonathan Ballet
59c105b4b9
doc: fix documentation formatting in salt.states.boto_iam*
2015-11-11 12:00:59 +01:00
Jonathan Ballet
cbb167c8ee
doc: fix documentation formatting in in salt.modules.lxc
2015-11-11 12:00:17 +01:00
Jonathan Ballet
cb03a89e52
doc: fix documentation formatting in salt.modules.aptpkg
2015-11-11 12:00:08 +01:00
Damian Myerscough
206d1684b2
Fixing CherryPy key bug
2015-11-10 22:20:59 -08:00
Justin Findlay
987d1fee7c
simplify stdin use of stdin in at.present state
...
Corollary to #28187 .
2015-11-10 22:43:51 -07:00
Justin Findlay
dbd582cd8d
fix doc formatting in user.present state
2015-11-10 21:57:08 -07:00
Justin Findlay
3824d2e9fc
only change/report new home when createhome is True
2015-11-10 21:56:34 -07:00
Justin Findlay
3fbf81611f
remove redundant logic in useradd execution module
...
Fixes #28726 .
2015-11-10 21:55:08 -07:00
Justin Findlay
d77c24e70d
Merge pull request #28752 from aboe76/suse_tumbleweed_grain
...
Update openSUSE grain for tumbleweed
2015-11-10 20:54:37 -07:00
Justin Findlay
a620bc5596
Merge pull request #28713 from hexedpackets/fix-consul-module
...
Rename consul.list to consul.list_keys.
2015-11-10 17:57:23 -07:00
Michael Barrientos
6df6cb82a6
Fix pip command to not quote spaces in cmd line args
2015-11-10 16:34:18 -08:00
Metin Osman
e31e22d96a
Fix 25775
...
Loop lsblk cmd exec until ok or 30s max
2015-11-11 01:33:25 +01:00
Justin Findlay
e321d60002
import gate elementtree in artifactory module
2015-11-10 17:25:18 -07:00
Justin Findlay
f20f3f697b
import gate elementtree in boto_iam state
2015-11-10 17:25:18 -07:00
Justin Findlay
9845d2f2c6
import gate elementtree in boto_cfn state
...
Fixes #28655 .
2015-11-10 17:25:18 -07:00
rallytime
5abe010023
Move most vmware driver list_* functions to use salt.utils.vmware functions
2015-11-10 16:23:27 -07:00
Niels Abspoel
764cb16ef0
Update openSUSE grain for tumbleweed
...
After discussion with Richard Brown from Opensuse,
Added openSUSE Tumbleweed grain for future release
As it stands the following distributions of Suse are:
openSUSE Leap
openSUSE Tumbleweed
openSUSE (numbered releases)
SLES (Suse Linux Enterprise Server)
SLED (Suse Linux Enterprise Desktop)
For reference see:
https://bugzilla.suse.com/show_bug.cgi?id=954135
2015-11-10 20:02:18 +01:00
Mike Place
6f8f04975f
Merge pull request #28746 from rallytime/bp-28718
...
Back-port #28718 to 2015.5
2015-11-10 11:16:39 -07:00
Nicole Thomas
45c73ebf2f
Merge pull request #28716 from rallytime/bp-28705
...
Back-port #28705 to 2014.7
2015-11-10 09:15:03 -07:00
Steve Hajducko
092f441cad
Account for no POST data
...
The serving.request doesn't include a raw_body when the POST data
is blank, so set it to an empty dict.
Also fixed a bug where we assumed that if data wasn't a list, it
was a dict, which bombs because null POSTS result in None.
2015-11-10 09:09:08 -07:00
William Huba
0889907b3c
Make consul.list a function alias.
...
Fixes #28712 .
2015-11-10 10:25:17 -05:00
Gareth J. Greenaway
882350a543
Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler.
2015-11-09 22:05:38 -08:00
jacobhammons
decc31a766
Merge pull request #28719 from jacobhammons/spm
...
removed dependencies info from docs
2015-11-09 17:04:53 -07:00
Colton Myers
989069f44a
Merge pull request #28709 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-09 16:38:27 -07:00
Mike Place
f4fe921965
Merge pull request #28717 from cachedout/umask_note
...
Add note about recommended umask
2015-11-09 16:26:20 -07:00
Jacob Hammons
d7017be031
removed dependencies info from docs
2015-11-09 16:07:17 -07:00
