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
50,479 Commits 24 Branches 182 Tags 341 MiB
c95bb60148
Commit Graph

50479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Hammons
c95bb60148 Version to 2015.8.4 2016-02-02 13:05:42 -07:00
Mike Place
80a36793cb Merge pull request #30784 from rallytime/bp-24952 
Back-port #24952 to 2015.5
 2016-02-01 14:43:01 -07:00
Mike Place
e978f5392f Merge pull request #30764 from terminalmage/issue30560 
Work around yum versionlock's inability to remove holds by package name alone
 2016-02-01 11:14:26 -07:00
Peter N
a07908bdea Don't split the string on a single line 
This is to address https://github.com/saltstack/salt/issues/18991
 2016-02-01 11:03:08 -07:00
Erik Johnson
39736afcd7 Work around yum versionlock's inability to remove holds by package name alone 
Fixes #30560.
 2016-01-31 22:03:27 -06:00
Thomas S Hatch
6f565c0d76 Merge pull request #30760 from toanju/2015.5 
Changed output format of arp_ip_target from list to comma delimited...
 2016-01-31 12:05:02 -07:00
Thomas S Hatch
1c205b4898 Merge pull request #30757 from yannis666/fix-for-mine-update-merge 
Fix to mine update to merge configuration
 2016-01-31 12:02:43 -07:00
tomwalsh
dc4256f7df Changed output format of arp_ip_target from list to comma delimited string 2016-01-30 13:26:59 +01:00
yannis_cosmadopoulos
61bb23e256 Fix to mine update to merge configuration 
This addresses issue: #30722
 2016-01-29 15:33:22 -08:00
Mike Place
f9fde8f6a7 Merge pull request #30749 from abednarik/fix_network_system_test 
Fix Netwotk hostname Module in Debian systems.
 2016-01-29 17:01:09 -06:00
abednarik
1e9e97df59 Fix Netwotk hostname Module in Debian systems. 
Loks like there is no check for test in **settings. Bacause of this, even when using
test=True salt will edit /etc/hostname in Debian family distros.

Fixes #28751.
 2016-01-29 16:29:22 -03:00
Thomas S Hatch
076268089a Merge pull request #30699 from abednarik/save_load_retry_time 
Add Retry to save_load.
 2016-01-29 09:08:30 -07:00
Nicole Thomas
8d79d1b9c7 Merge pull request #30659 from sjmh/fix-scsi 
Fix lsscsi issues for certain platforms
 2016-01-28 08:53:38 -07:00
abednarik
186872cf49 Add Retry to save_load. 
Same as retry in preg_jid this should help fix a race condition when
jod id id is create and another process removes that.

Fixes #28438.
 2016-01-28 10:48:59 -03:00
Steve Hajducko
3544dd995e Fix lsscsi issues for certain platforms 
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.

The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
 2016-01-27 21:15:26 -08:00
C. R. Oldham
516919525a Merge pull request #30671 from techhat/lockcloud 
Add file locking to cloud index
 2016-01-27 10:14:55 -07:00
Joseph Hall
4719f8d4ea Whitespace 2016-01-27 09:32:15 -07:00
Joseph Hall
8e7eca23e4 Add file locking to cloud index 2016-01-27 09:17:14 -07:00
Colton Myers
643c9c9616 Merge pull request #30586 from abednarik/fix_comment_line_perms 
Fix comment_line permissions.
 2016-01-25 16:24:01 -07: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
abednarik
8b395a42cb Fix comment_line permissions. 
In order to preserve file permissions when comment/uncomment file
we should run check_perms before and after editing files.

Fixes #28320.
 2016-01-24 11:26:10 -03:00
Erik Johnson
410da789f9 yumpkg.check_db: run separate repoquery commands when multiple names passed 2016-01-24 00:49:12 -06:00
Mike Place
8e56be7f4c Merge pull request #30548 from jacobhammons/doc-fixes 
Added placeholder release notes for 2015.5.10
 2016-01-22 11:36:01 -07:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10 
Changed old doc links from docs.saltstack.org to docs.saltstack.com
 2016-01-22 10:48:08 -07:00
Mike Place
1aafd4c5b5 Merge pull request #30530 from terminalmage/yumpkg-dnf-cleanup 
2015.5 tweaks from #30529
 2016-01-22 09:26:21 -07:00
Erik Johnson
2586f71bcf 2015.5 tweaks from #30529 
In the process of resolving merge conflicts in the merge-forward of
2015.5 to 2015.8 which I did in #30529, I found two changes that should
have been made in the 2015.5 branch. One was the removal of yum-specific
information in the pkg.remove docstring, and the other was needless use
of -q when deleting a version lock in pkg.unhold. We're not parsing the
output and the default loglevel is debug, so using -q here removes
helpful troubleshooting output from the log.
 2016-01-22 02:01:33 -06:00
Colton Myers
7798d42272 Merge pull request #30484 from terminalmage/dnf-yumpkg-2015.5 
Backport DNF support to 2015.5 branch
 2016-01-21 15:14:46 -07:00
Colton Myers
b348f804b1 Merge pull request #30512 from jfindlay/repo_test 
disable pkgrepo test for ubuntu 15.10+
 2016-01-21 14:32:58 -07:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
Mike Place
a9348dfef8 Merge pull request #30478 from jtand/pip_8_update 
Updated pip_state to work with pip 8.0
 2016-01-21 09:02:41 -07:00
Erik Johnson
330e26d1da Hide get_locked_packages 2016-01-21 09:56:13 -06:00
Erik Johnson
5a637420e8 Backport DNF support to 2015.5 branch 
This will allow 2015.5 releases to operate successfully on Fedora 22 and
newer.
 2016-01-21 09:56:13 -06:00
Mike Place
a30147c64f Merge pull request #30482 from borgstrom/pyobjects_recursive 
Pyobjects recursive import support (for 2015.5)
 2016-01-21 08:54:32 -07:00
Evan Borgstrom
2c55a7580b Fixup lint errors 2016-01-20 15:29:30 -08:00
Evan Borgstrom
b46df0e4b5 Allow recursive salt:// imports 
Fixes #30465
 2016-01-20 11:20:50 -08:00
justinta89
6227368830 Convert version to int, instead of comparing strings to ints 2016-01-20 12:00:50 -07:00
justinta89
20384a4810 Added InstallationError to except block 2016-01-20 11:05:41 -07:00
justinta89
baa274bca9 Updated pip_state to work with pip 8.0 
Pip 8.0.0 added an InstallationError exception. Updated the state to catch that
exception properly.
 2016-01-20 11:03:18 -07:00
Evan Borgstrom
51bfa16173 Add test to prove that recursive imports are currently broken 
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
 2016-01-20 09:57:16 -08:00
Mike Place
5c7cc51937 Merge pull request #30459 from jfindlay/pkg_tests 
modules.pkg: disable repo int test for ubuntu 15.10
 2016-01-20 09:41:12 -07:00
Justin Findlay
fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 2016-01-19 15:27:12 -07:00
Mike Place
dd2ceb4c07 Merge pull request #30443 from jtand/boto_vpc_5 
Boto uses False for is_default instead of None
 2016-01-19 11:28:08 -07:00
Mike Place
62d9dddced Merge pull request #30420 from attiasr/patch-1 
Backport #26853
 2016-01-19 10:33:58 -07:00
justinta89
2f77152479 Boto uses False for is_default instead of None 2016-01-19 10:12:11 -07:00
Rudy Attias
4de343c5a1 Backport #26853 2016-01-18 13:16:09 +02:00
C. R. Oldham
5a923b3aa9 Merge pull request #30364 from rallytime/fix-30341 
Add TLS version imports and add linode driver documentation notices
 2016-01-14 12:04:47 -07:00
rallytime
79bcf151cb Add TLS version imports and add linode driver documentation notices 
Fixes #30341
 2016-01-14 11:19:35 -07:00
Mike Place
f037fd9c27 Merge pull request #30184 from rallytime/bp-30166 
Back-port #30166 to 2015.5
 2016-01-13 11:27:36 -07:00
Mike Place
1d8413fd2f Merge pull request #30291 from thegoodduke/for_fix_ipset 
ipset: fix test=true & add comment for every entry
 2016-01-12 12:40:23 -07:00
C. Gao
62d6ccf561 ipset: fix test=true & add comment for every entry 2016-01-12 14:34:46 +08:00