valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,195 Commits 24 Branches 182 Tags 341 MiB
1644641c57
Commit Graph

49195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
1644641c57 Move cmd.run aliasing to a wrapper class to prevent side effects 2015-07-23 15:52:11 -06:00
Nicole Thomas
c36b714401 Merge pull request #25666 from nmadhok/vmware-cloud-fix_2015.5 
Check if the properties exist before looping over them causing KeyError
 2015-07-23 11:55:40 -06:00
Nitin Madhok
8e812296ef Check if the properties exist before looping over them causing KeyErrors Fixes #25665 2015-07-23 12:58:27 -04:00
Mike Place
36d04b2954 Merge pull request #25656 from alprs/fix-locale_detection 
Fix locale detection in debian/gentoo
 2015-07-23 10:46:40 -06:00
Justin Findlay
b1c1735aae Merge pull request #25661 from rallytime/bp-25624 
Back-port #25624 to 2015.5
 2015-07-23 10:26:48 -06:00
Justin Findlay
6a2843dee2 Merge pull request #25662 from rallytime/bp-25638 
Back-port #25638 to 2015.5
 2015-07-23 10:26:40 -06:00
Mark McGuire
90d833d5dc fix bad merge 99fc7ec 2015-07-23 09:41:54 -06:00
Ian Babrou
4e1fcfa15e Fix typo in get_routes example for debian_ip 2015-07-23 09:40:28 -06:00
Andreas Lutro
a260236942 change variable name 2015-07-23 15:18:08 +02:00
Andreas Lutro
dd2a188c05 fix tests 2015-07-23 15:17:18 +02:00
Andreas Lutro
aefd0fb374 code formatting 2015-07-23 15:16:49 +02:00
Andreas Lutro
e58d222fb0 fix locale detection in debian/gentoo 2015-07-23 12:57:16 +02:00
Mike Place
00f4689fe3 Merge pull request #25644 from cachedout/issue_25413 
pillar doc fix
 2015-07-22 16:57:23 -06:00
Mike Place
8cef61e6cc pillar doc fix 
closes #25413
 2015-07-22 16:56:53 -06:00
Mike Place
aeaeb53ed6 Merge pull request #25642 from cachedout/issue_25540 
Warn on pillar schedule delete
 2015-07-22 16:04:11 -06:00
Mike Place
74f6b6930c Warn on pillar schedule delete 
Closes #25540
 2015-07-22 16:03:25 -06:00
Mike Place
7b79e433f1 Merge pull request #25598 from twangboy/fix_25437 
Fixed problem trying to load file with name of boolean type
 2015-07-22 11:07:49 -06:00
Mike Place
f4a38a8aee Merge pull request #25604 from terminalmage/fix-mock_open 
Move patching of mock_open to within test
 2015-07-22 10:53:55 -06:00
Mike Place
224484df7e Merge pull request #25609 from s0undt3ch/hotfix/bootstrap-script-2015.5 
[2015.5] Update the bootstrap script to latest release v2015.07.22
 2015-07-22 10:28:52 -06:00
Erik Johnson
123b8ee1cb Fix mock_open patch 
Forgot to add this when I removed the decorator in my previous commit.
 2015-07-22 11:09:15 -05:00
Mike Place
07eb78c79f Merge pull request #25603 from terminalmage/issue21912 
Add version_cmp function to yumpkg.py
 2015-07-22 09:42:29 -06:00
Pedro Algarvio
96a8568336 Update the bootstrap script to latest release v2015.07.22 
* Fix tornado installation in Ubuntu. Thanks Yushi Nakai. saltstack/salt-bootstrap#627
* Install tornado using pip on Ubuntu for Salt's v2015.8.xx onward stable releases.
* Install requests on Ubuntu from Chris Lea's PPA. saltstack/salt-bootstrap#630
 2015-07-22 13:22:08 +01:00
Erik Johnson
af82835f42 Move patching of mock_open to within test 
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
 2015-07-22 03:04:07 -05:00
Erik Johnson
99e532ba74 Add versionadded directive 2015-07-22 00:17:30 -05:00
Erik Johnson
8a1765fc6f Add version_cmp function to yumpkg.py 
This uses rpmUtils to more accurately compare version numbers, as
distutils.version.LooseVersion fails to successfully compare some
version numbers.

Fixes #21912.
 2015-07-21 23:33:43 -05:00
Erik Johnson
457e72e273 Fix refernces to __salt__['version_cmp'] 
This will never exist, this should have been __salt__['pkg.version_cmp']
from the beginning.
 2015-07-21 23:32:06 -05:00
Erik Johnson
a19fa2296a Avoid using single-letter variable 2015-07-21 23:29:22 -05:00
twangboy
c53e11d42c Fixed problem trying to load file with name of boolean type 2015-07-21 16:25:41 -06:00
Mike Place
69ef81caba Merge pull request #25590 from garethgreenaway/25560_2015_5_schedule_return_data 
2015.5 scheduled jobs return data
 2015-07-21 15:57:42 -06:00
Mike Place
9ffefc867e Merge pull request #25584 from rallytime/bp-24054-and-25576 
Back-port #24054 and #25576 to 2015.5
 2015-07-21 15:16:37 -06:00
Mike Place
a966e439d1 Merge pull request #25589 from jahamn/Fix-ssh_known_host-not-taking-port-into-account 
Fixes ssh_known_host not taking port into account
 2015-07-21 15:15:06 -06:00
Gareth J. Greenaway
19ca0c0b40 Switching default in 2015.5 for whether job data in returned to the mater job_cache. 2015-07-21 13:34:31 -07:00
Jason Hamner
8db7ada82d Fixed pylint e8303 errors 2015-07-21 14:03:21 -06:00
Jason Hamner
6abad29f66 Fixed pylint errors 2015-07-21 13:48:17 -06:00
Jason Hamner
8ae6ba1290 Merge branch '2015.5' of https://github.com/saltstack/salt into Fix-ssh_known_host-not-taking-port-into-account 2015-07-21 12:44:32 -06:00
Jason Hamner
c7466e7894 Fixes ssh_known_host to take port into account 
Fixes #23626

Also adds port support for get_known_host, check_known_host, and
rm_known_host
 2015-07-21 12:43:58 -06:00
Justin Findlay
df74f2c3ad Merge pull request #25573 from EvaSDK/2015.5.3-lxc-fixes 
Do not execute bootstrap script twice
 2015-07-21 12:20:03 -06:00
Peter Norton
aa9598e3a5 s3fs breaks when fetching files from s3 
Per https://github.com/saltstack/salt/issues/23567 there is an exception
when trying to parse headers.  The values in the returned ret['headers']
now defaults to just being a list of strings containing the keys, but no
values are included.  It seems that in the past a list of strings of
key:value pairs was returned.

This patch requests full_headers, which instead returns a dictionary of
header keys and values.  The keys are lowercased, but otherwise they
seem to be the same.

So this patch requests the full_headers and deals with lowercasing the
desired headers.  This works for me as long as both
8999148da0
and
80c7a697ae
are applied.
 2015-07-21 10:31:08 -06:00
Matthew Williams
1667d67c3e s3.head: return useful data 2015-07-21 10:30:33 -06:00
Mike Place
79a809dd79 Merge pull request #25580 from attiasr/patch-1 
use explicit utf-8 decoding (#25532)
 2015-07-21 09:40:49 -06:00
Thomas S Hatch
6edf196533 Merge pull request #25568 from twangboy/fix_25206 
Fixed win_useradd module to add fullname
 2015-07-21 08:30:25 -06:00
Rudy Attias
4b7dc96919 use explicit utf-8 decoding (#25532) 
since salt.utils.sdecode() is bias toward system encoding(defaults to cp1252) and it differs from the strings returned from _get_reg_software() (utf-8)
(#25532)
 2015-07-21 14:25:11 +03:00
twangboy
fbee445c6d Commented out a pylint error 2015-07-20 18:04:51 -06:00
Gilles Dartiguelongue
49cec9f9a1 Use a more persistent tmp directory 
Per FHS, /var/tmp contains temporary files and directories that are not
cleaned up across system reboots. It looks like some commands in the
bootstrap process resulted in "boots" of the LXC inadvertently cleaning
/tmp while its content was still needed. No such problem occurs when
/var/tmp is used.
 2015-07-21 00:30:20 +02:00
Gilles Dartiguelongue
96a672f8e0 Do not execute bootstrap script twice 2015-07-21 00:08:17 +02:00
twangboy
4b56dc3893 Fixed win_useradd module to add fullname 2015-07-20 15:32:28 -06:00
Mike Place
3c32b0b669 Merge pull request #25561 from twangboy/fix_21041_again 
Fixed the gem module to work on windows... without injection
 2015-07-20 15:12:15 -06:00
twangboy
aaf3f3dcd0 Fixed some line and style issues 2015-07-20 13:42:50 -06:00
twangboy
e6d0e5cda7 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 13:42:31 -06:00
Mike Place
9e19142c35 Merge pull request #25521 from cachedout/orch_outputter 
Fix outputter for state.orch
 2015-07-20 13:30:13 -06:00