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
35,364 Commits 24 Branches 182 Tags 341 MiB
2339984e48
Commit Graph

35364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
2339984e48 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f776c19a77 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f38c312164 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
e32893b748 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
537c681f62 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
37b4088cf5 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
88fc98fa8a Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
1ea6279bd7 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
061424239b Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f391456dd5 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
b338a31691 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
778574c9d5 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
36d59944d1 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
c094f8bd68 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
604a131f6f Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
05fdb3c8fd Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
fbce823db7 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f47dd063e3 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f056c9c3fa Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
132bdb78ee Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
70f10cb13e Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
13cc497b36 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Thomas S Hatch
d35e38907f Merge branch 'SmithSamuelM-2014.7_sam3' into 2014.7 2014-09-17 13:49:48 -06:00
Thomas S Hatch
9b54e5b55a lint fixes 2014-09-17 13:49:29 -06:00
Thomas S Hatch
1cb62b7e76 Merge branch '2014.7_sam3' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam3 2014-09-17 13:47:01 -06:00
Erik Johnson
27bea519c9 Merge pull request #15879 from s0undt3ch/hotfix/protect-from-older-libcloud 
Allow the docs to build by faking libcloud's `__version__` attribute.
 2014-09-17 14:42:45 -05:00
Samuel M Smith
ea1aa72115 road stack setup now uses opts 'raet_mutable' and 'raet_main' 2014-09-17 13:04:02 -06:00
Pedro Algarvio
75bafbd6db Allow the docs to build by faking libcloud's __version__ attribute. 2014-09-17 20:03:48 +01:00
Nicole Thomas
5e248e0ebd Merge pull request #15842 from whiteinge/doc-salt-unity-data-files 
Added salt-unity manpages to setup.py data_files
 2014-09-17 12:55:06 -06:00
Nicole Thomas
9ddaeb5847 Merge pull request #15873 from terminalmage/fix-docstring 
Fix incorrect docstring
 2014-09-17 12:53:54 -06:00
Erik Johnson
736659a720 Fix incorrect docstring 
mod_watch just executes the module.run state here, which does not use
the 'func' parameter. This commit fixes the documentation to reflect the
proper argument name.
 2014-09-17 12:40:04 -05:00
Thomas S Hatch
1be9c6aa64 Merge pull request #15868 from rallytime/bp_f8177149 
Backport f8177149
 2014-09-17 11:38:44 -06:00
Samuel M Smith
8855520820 Added raet_mutable and raet_main config opts to salt. 
raet_mutable enables (True)  a mutable raet road where rejoins can change road data otherwise no changes allowed on rejoin
raet_main enables (True) the raet road stack to accept vacuous joins otherwise no vacuous joins accepted
 2014-09-17 11:31:23 -06:00
Cimarron Mittelsteadt
986b375583 BUG: Fix the absolute directory check in file.symlink for the path of the symbolic link itself and perform user expansion on that. 
Conflicts:
	salt/modules/file.py
 2014-09-17 09:21:16 -06:00
Nicole Thomas
b5d0865ef9 Merge pull request #15854 from terminalmage/bp-15546 
Backport #15546 to 2014.7 branch
 2014-09-16 20:11:15 -06:00
Erik Johnson
c24969b2c0 Remove unused import 2014-09-16 18:59:47 -05:00
Mathieu Le Marec - Pasquet
7b25a42f23 Fix encoding issues in nested output 
This fixes #15542
 2014-09-16 18:57:37 -05:00
David Boucha
caccd64dc6 Merge pull request #15853 from terminalmage/buildpackage-el5 
Fix --define directive for Cent5 builds
 2014-09-16 17:21:14 -06:00
Erik Johnson
3f19d518fb Fix --define directive for Cent5 builds 2014-09-16 18:16:44 -05:00
Samuel M Smith
11dfa28836 Merge branch 'raetpeer_3' into 2014.7_sam3 
Conflicts:
	salt/transport/__init__.py
 2014-09-16 16:32:44 -06:00
Thomas S Hatch
c8b8cb3682 Merge pull request #15848 from cachedout/multimaster_opts 
Re-inject opts into modules under multi-master mode.
 2014-09-16 16:02:14 -06:00
Mike Place
e237179706 Re-inject opts into modules under multi-master mode. 2014-09-16 15:16:32 -06:00
Thomas S Hatch
de5c78ce9c Merge pull request #15843 from thatch45/ssh_version 
Add ssh version check
 2014-09-16 14:28:46 -06:00
Thomas S Hatch
9849bf3dee Merge pull request #15841 from thatch45/random_audit 
Add some calls to systemrandom where it might be good to have a
 2014-09-16 13:55:49 -06:00
Seth House
1e6155928f Added salt-unity manpages to setup.py data_files 
Refs #13937
 2014-09-16 12:01:16 -07:00
Colton Myers
8168230eab Merge pull request #15821 from rallytime/azure_cloud_tests 
Add Azure cloud provider tests
 2014-09-16 12:55:45 -06:00
Thomas S Hatch
12b9b52dcb Add some calls to systemrandom where it might be good to have a 
little better random data
 2014-09-16 12:37:49 -06:00
Thomas S Hatch
6e6a0ae420 Merge pull request #15838 from thatch45/random_fix 
Always use system random
 2014-09-16 12:24:40 -06:00
Thomas S Hatch
62b94b1e24 Always use system random 2014-09-16 11:43:25 -06:00
Thomas S Hatch
c85e889eb4 Add ssh version chgeck 2014-09-16 11:40:36 -06:00