valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
50,608 Commits 24 Branches 182 Tags 341 MiB
1b97e4a3df
Commit Graph

50608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Findlay
92889db638 Merge pull request #30248 from jfindlay/2015.5 
add 2015.5.9 release notes
 2016-01-08 16:13:10 -07:00
Justin Findlay
741f7aba31 add 2015.5.9 release notes 2016-01-08 16:08:03 -07:00
jacobhammons
7a329d89d7 Merge pull request #30237 from jacobhammons/man-pages-prev 
Updated man pages, copyright year, and doc version for 2015.5.9
 2016-01-08 11:10:05 -07:00
Jacob Hammons
2431c4c5c3 Updated man page and doc conf.py copyright year to 2016 2016-01-08 11:08:59 -07:00
Jacob Hammons
fe3da1c174 Updated man pages and doc version for 2015.5.9 2016-01-08 11:05:46 -07:00
Nicole Thomas
2c0b725924 Merge pull request #30207 from rallytime/rabbitmq_states_doc_fix 
Use correct spacing in rabbitmq state examples
 2016-01-07 11:37:35 -07:00
rallytime
8d48c24182 Use correct spacing in rabbitmq state examples 2016-01-07 11:19:39 -07:00
jacobhammons
b49cf910f4 Merge pull request #30191 from jacobhammons/banner-prev 
Updated doc site banners
 2016-01-06 15:37:40 -07:00
Jacob Hammons
c3390955b0 Updated doc site banners 2016-01-06 15:18:11 -07:00
Rob Gott
fa6b1b3022 adding split_env call to cp.hash_file to pick up saltenv in file query parameter 2016-01-06 13:02:57 -07:00
Mike Place
9363d6f5b6 Merge pull request #30125 from abednarik/update_user_home 
Update user home event when createhome is set to False
 2016-01-05 11:15:38 -07:00
Mike Place
1a5d585d91 Merge pull request #30127 from jsutton/clarify-documenation-for-random_master 
Updating documentation and example minion config for random_master/master_shuffle.
 2016-01-04 12:30:50 -07:00
Jered Sutton
01dbf385ef Adding random_master to reference and updating master_shuffle. 
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
 2016-01-02 23:49:08 -06:00
abednarik
56544a77f6 Update user home event when createhome is set to False 
Removed cretehome from if statement since home should be updated even when createhome is set
to False.

Fixes #29633.
 2016-01-02 18:18:16 -03:00
Joseph Hall
28b1bbbe77 Merge pull request #30110 from markckimball/fix-verify_ssl-in-joyent-cloud 
Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly
 2015-12-31 14:17:52 -07:00
Mark Kimball
e1c08cb269 Fixed flag sent to salt.utils.http in order for 
verify_ssl to work appropriately.
 2015-12-31 13:27:40 -07:00
Mike Place
040412b0b1 Merge pull request #30093 from zmalone/pillar-notes 
Noting that file_roots and "state tree" should both be avoided
 2015-12-30 15:40:05 -07:00
Mike Place
25edefc93a Merge pull request #30097 from cachedout/note_on_password_process_list 
Note concern about cleartext password in docs for shadow.gen_password
 2015-12-30 15:37:33 -07:00
Mike Place
58aec884ef Note concern about cleartext password in docs for shadow.gen_password 
Closes #28120
 2015-12-30 15:03:23 -07:00
Zach Malone
cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some 
environments, the actual states show up another level down.  Adding notes about why this is undesirable.
 2015-12-30 13:10:46 -07:00
Mike Place
6b1c3a6bf2 Merge pull request #30089 from mpreziuso/patch-1 
Fixes terminology and adds more accurate details about the algorithms
 2015-12-30 13:02:18 -07:00