Commit Graph

65016 Commits

Author SHA1 Message Date
Kris Raney
e10a10050b Put in pylint forward compatibility recommendation. 2016-01-25 11:33:05 -06:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Nicole Thomas
d5b8ecf579 Merge pull request #30607 from eyj/pr-snapshot-credentials
Fix credentials passing in boto_ec2.snapshot_created
2016-01-25 10:19:53 -07:00
Nicole Thomas
89b4f3de1b Merge pull request #30609 from seanjnkns/backport_30602
Fix documentation for pillar_merge_lists which default is False, not …
2016-01-25 10:15:45 -07:00
Christophe Drevet-Droguet
3ebb8249d7 file.line: better diff 2016-01-25 10:12:32 -07:00
Nicole Thomas
a06734c4ec Merge pull request #30591 from mlalpho/salt-cloud-clouds-ec2-AssociatePublicIpAddress-fix
salt-cloud-clouds-ec2 AssociatePublicIpAddress fix
2016-01-25 10:03:07 -07:00
Michal Suba
603029bc04 Update mysql.py
fixed trailing whitespace
2016-01-25 18:00:35 +01:00
Nicole Thomas
eb771585f9 Merge pull request #30602 from seanjnkns/pillar_merge_lists-doc-bug
Fix documentation for pillar_merge_lists which default is False, not …
2016-01-25 09:54:52 -07:00
Kris Raney
92cf88e5fd Retry waiting for IAM role to be propagated 2016-01-25 10:50:22 -06:00
Nicole Thomas
24ead62c41 Merge pull request #30584 from julianbrost/fix-doc-file-line-missing-colon
file.line state: add missing colon in docstring
2016-01-25 09:37:38 -07:00
Nicole Thomas
afdbb745c6 Merge pull request #30581 from JacobCWard/develop
Fixes #30569
2016-01-25 09:36:03 -07:00
Michael Alphonso
22f6009030 fixed 2016-01-25 11:25:01 -05:00
Michael Alphonso
7448cccc58 fixed 2016-01-25 11:23:48 -05:00
Nicole Thomas
a7ba2df5e2 Merge pull request #30589 from terminalmage/2015.5-2015.8
Merge 2015.5 into 2015.8
2016-01-25 09:20:41 -07:00
EYJ
27ecac04a0 Fix credentials passing in boto_ec2.snapshot_created 2016-01-25 17:18:46 +01:00
EYJ
48089e3e80 Allow setting of tags with value None 2016-01-25 17:18:14 +01:00
Sean Jenkins
9924acdc43 Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:57:39 -07:00
Nicole Thomas
48b2f506fb Merge pull request #30593 from mlalpho/salt-boto_vpc-updates
salt-boto_vpc updates
2016-01-25 08:55:08 -07:00
Sean Jenkins
841192ee2d Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:49:13 -07:00
Michal Suba
61217a73a2 addressing #29265
column name for password string has changed since MySQL 5.7 . This commit adds ability to specify it as parameter
2016-01-25 16:48:56 +01:00
Bo Maryniuk
d3cfd8ed41 Cleanup formatting 2016-01-25 16:43:50 +01:00
Bo Maryniuk
1bdbaac658 Add error handling 2016-01-25 16:43:25 +01:00
Bo Maryniuk
2ec5cec8a4 Add a new line before the last return 2016-01-25 16:42:20 +01:00
Bo Maryniuk
424383b8c4 Remove unnecessary complexity and string increment 2016-01-25 16:41:52 +01:00
Bo Maryniuk
48e8d90343 Avoid backslashes where they are not needed 2016-01-25 16:41:11 +01:00
Bo Maryniuk
6df5d500f0 Use regexp type for the string. 2016-01-25 16:40:50 +01:00
Bo Maryniuk
c2ca141956 Get version as an explicit parameter 2016-01-25 16:40:23 +01:00
Nicole Thomas
09f9f78d94 Merge pull request #30534 from rmohr/copr
COPR project moved
2016-01-25 08:39:34 -07:00
Nicole Thomas
3a55d11916 Merge pull request #30599 from multani/fix/docs
Documentation formatting fixes
2016-01-25 08:37:46 -07:00
Michael Alphonso
65ba18c18f line ending 2016-01-25 10:29:17 -05:00
Bo Maryniuk
9e944db706 Check the version of the package, instead of the package name 2016-01-25 15:00:45 +01:00
Jonathan Ballet
038ecc4acd For doc formatting of salt.states.module 2016-01-25 12:26:44 +01:00
Jonathan Ballet
4062c63b9f Fix doc formatting for yaml_idiosyncrasies 2016-01-25 12:26:30 +01:00
Jonathan Ballet
6efb77bc04 Fix doc formatting of salt.modules.parted 2016-01-25 12:26:09 +01:00
Jonathan Ballet
a329adfb21 Add missing salt.queues.* documentation 2016-01-25 12:19:21 +01:00
Jonathan Ballet
2465cf4ba5 Remove non-existing documentation
This removes warnings during the documentation compilation
2016-01-25 12:19:21 +01:00
Jonathan Ballet
814e64c304 Fix documentation markup in salt.modules.osquery 2016-01-25 12:19:21 +01:00
Jonathan Ballet
d2614d6169 Fix documentation markup for salt.modules.ipmi 2016-01-25 12:19:21 +01:00
Jonathan Ballet
276eb3a843 Fix GCE documentation 2016-01-25 12:19:21 +01:00
Jorge Schrauwen
ef4b5a5836 update naming to match closer with mdata-* tools 2016-01-25 09:18:19 +00:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Roman Mohr
044fe44ae9 COPR project moved
Replace old url http://copr.fedoraproject.org with
https://copr.fedorainfracloud.org to fix broken bootstrap script.
2016-01-24 18:43:02 +01:00
Colton Myers
a823e21428 Merge pull request #30582 from terminalmage/dnf-repoquery-multiple-targets
yumpkg.check_db: run separate repoquery commands when multiple names passed
2016-01-24 10:15:04 -07:00
Michael Alphonso
31cc97ccf4 looks like a re-merge of PR #20972 which relates to #19288 2016-01-24 12:12:15 -05:00
Michael Alphonso
a454df55c4 - added log info while waiting. displays current status and wait time.
- updated conditional check for wait status to check for specified status from state sls data.
  + previously was only checking to see if the current status was in ['available', 'modifying', 'backing-up'], which defeats the purpose of specifying wait_status at all.
  + PR forces state run to wait until the specified status is returned. So, if you specify 'available' in the state, you know the database instance can be contacted when the state run returns.
- Updated call for get_endpoint to make sure the Endpoint and its Address are set
- spelling error in state
2016-01-24 12:08:34 -05:00
Michael Alphonso
2e30c0fed2 - explicitly defined input arguments
- added defaults to some arguments in the function definitions
2016-01-24 12:04:48 -05:00
Michael Alphonso
a3c782762d - explicitly defined input arguments 2016-01-24 12:00:54 -05:00
Michael Alphonso
8053727e7d - shortened mkdir command to include setting mode.
- removed `sh -c` call to subshell for mkdir since root_cmd already wraps the command in `sh -c` -- and mkdir wasn't behaving when called from subshell
 - updated conditional check to take ownership of new folder when using sudo
 - some spelling/grammar changes
2016-01-24 11:55:19 -05:00
Jorge Schrauwen
de5393bd41 mdata.get without parameter should return all properties, optimizations 2016-01-24 12:34:57 +00:00
Jorge Schrauwen
922267df05 implement salt.module.smartos_mdata 2016-01-24 12:24:45 +00:00