valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,248 Commits 24 Branches 182 Tags 341 MiB
1c6c394d0e
Commit Graph

60248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
1c6c394d0e Merge pull request #30615 from jfindlay/2015.8 
add 2015.8.4 release notes
 2016-01-25 11:11:02 -07:00
Justin Findlay
e4043403e4 add 2015.8.4 release notes 2016-01-25 11:10:07 -07:00
Nicole Thomas
ec50581aad Merge pull request #30612 from rallytime/bp-29940 
Back-port #29940 to 2015.8
 2016-01-25 10:52:43 -07:00
Colton Myers
48373e0ea9 Merge pull request #30613 from basepi/minion_clearfuncs_2015.8 
Fix minion/syndic clearfuncs
 2016-01-25 10:40:59 -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
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
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
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
3a55d11916 Merge pull request #30599 from multani/fix/docs 
Documentation formatting fixes
 2016-01-25 08:37:46 -07: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
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06: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
Julian Brost
2ab367f95b file.line state: add missing colon in docstring 2016-01-24 11:51:49 +01: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
b1e604add3 Merge pull request #30554 from rallytime/fix-10157 
Make the salt-cloud actions output more verbose and helpful
 2016-01-22 13:23:18 -07:00
rallytime
6fa952f16d Make the salt-cloud actions output more verbose and helpful 
Fixes #10157
 2016-01-22 11:45:50 -07:00
Mike Place
2eb5a3803d Merge pull request #30549 from techhat/virtcleanup 
Salt Virt cleanup
 2016-01-22 11:45:18 -07:00
Joseph Hall
9baab73cd0 Fix copy pasta 2016-01-22 11:42:39 -07:00
Mike Place
f63b183e43 Merge pull request #30553 from techhat/awsid 
AWS: Support 17-character IDs
 2016-01-22 11:41:46 -07: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
Joseph Hall
a95fbff4bc Support 17-character IDs 2016-01-22 11:28:01 -07:00
Joseph Hall
6413c11f29 Salt Virt cleanup 2016-01-22 10:53:23 -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
05d05263ab Merge pull request #30532 from whiteinge/slsutil-mod 
Add execution module for working in sls files
 2016-01-22 10:25:16 -07:00
Mike Place
1da1bb9afc Merge pull request #30529 from terminalmage/2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-01-22 10:19:39 -07:00
Erik Johnson
e85ad690fb Lint fixes 2016-01-22 10:58:34 -06:00
Seth House
a57d9984e4 Add slsutil to doc index 2016-01-22 09:45:45 -07:00
Seth House
155966c9d2 Add execution module for working in sls files 2016-01-22 09:45:45 -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
Erik Johnson
43829ecee6 Docstring tweaks 
This commit adds 2015.8-specific context to the top-level docstring and
also removes yum-specific terminology from the pkg.remove function.
 2016-01-22 01:53:03 -06:00
Erik Johnson
92d5a2a49c Fix spelling 2016-01-22 01:31:45 -06:00
Erik Johnson
fdc60fc04a Modify pkg.group_installed to reflect changes in yumpkg.py 2016-01-22 01:21:59 -06:00
Erik Johnson
a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 2016-01-22 01:20:27 -06:00
Mike Place
e366f6a7fd Merge pull request #30526 from twangboy/reg_flushkey 
Added FlushKey to make sure it's changes are saved to disk
 2016-01-21 19:33:13 -07:00
twangboy
23085ffbbb Added FlushKey to make sure it's changes are saved to disk 2016-01-21 18:21:55 -07:00
Mike Place
cdc731b8c5 Merge pull request #30521 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-21 16:05:03 -07:00
Mike Place
019af349af Merge pull request #30485 from jtand/pip_8_update_2015.8 
Updated pip_state to work with pip 8.0 on 2015.8
 2016-01-21 15:55:38 -07:00
Mike Place
3259fde362 Merge pull request #30494 from isbm/isbm-zypper-nfoinst-bool-fix 
Zypper: info_installed — 'errors' flag change to type 'boolean'
 2016-01-21 15:55:05 -07:00
Mike Place
596892326d Merge pull request #30506 from jacksontj/2015.8 
Properly remove newlines after reading the file
 2016-01-21 15:53:57 -07:00
Mike Place
15c7aedd46 Merge pull request #30508 from rallytime/linode-clone-fixes 
Fix Linode driver cloning functionality
 2016-01-21 15:53:36 -07:00
Mike Place
79528c59c3 Merge pull request #30522 from terminalmage/fix-worktree-tests 
Update git.list_worktree tests to reflect new return data
 2016-01-21 15:34:20 -07:00