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
34,040 Commits 24 Branches 182 Tags 341 MiB
f440b0f111
Commit Graph

34040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vs
f440b0f111 link in the multimaster_pki_tutorial 2014-07-15 03:41:12 -07:00
Volker Schwicking
3ca39de6d0 add settings for multimaster-pki 2014-07-15 12:10:18 +02:00
Volker Schwicking
f3d6c705ee add settings multimaster-pki 2014-07-15 12:09:52 +02:00
Seth House
d8b0d253fc Merge pull request #14166 from csakoda/develop 
#14143 ec2.query: handling the case where requesturl is passed in
 2014-07-14 23:27:57 -06:00
Erik Johnson
b69f433aef Merge pull request #14225 from s0undt3ch/develop 
Lint Fixes
 2014-07-14 21:18:05 -05:00
Seth House
9781919ac5 Merge pull request #14224 from UtahDave/update_twilio 
add exception handling and better output
 2014-07-14 18:47:41 -06:00
David Boucha
69fd25d360 Add more info the the debug log for exception 2014-07-14 18:46:21 -06:00
Pedro Algarvio
850e38d9eb Ignore W0221 2014-07-15 01:44:03 +01:00
Pedro Algarvio
698784d1e7 White-space lint fix 2014-07-15 01:43:52 +01:00
David Boucha
98e0258e19 add exception handling and better output 2014-07-14 18:40:15 -06:00
Samuel Smith
6536974b63 Merge pull request #14221 from SmithSamuelM/sam_raet_51 
Support for new SaltKeep object. Preparatory to storing keeps by name not uid
 2014-07-14 17:50:31 -06:00
Samuel M Smith
4b75d806de Merge remote-tracking branch 'upstream/develop' into sam_raet_51 2014-07-14 17:46:23 -06:00
Samuel M Smith
e38491d710 Merge branch 'byname' into sam_raet_50 2014-07-14 17:43:33 -06:00
Samuel M Smith
4fabb3670a Fix stack track when module is None 2014-07-14 17:41:23 -06:00
Thomas S Hatch
778f3aa55d Merge pull request #14218 from cachedout/masterswarm 
Basic master support for minionswarm
 2014-07-14 17:15:04 -06:00
Thomas S Hatch
63ea2267cd Merge pull request #14216 from cro/portfile 
Update MacPorts Portfile
 2014-07-14 17:14:37 -06:00
Samuel M Smith
418a4e4113 Preliminar support for new SaltKeep 2014-07-14 17:14:27 -06:00
Thomas S Hatch
dd7cc0dcbb Merge pull request #14215 from whiteinge/doc-fix-mailing-list-links 
Fix bad global rST links for the mailing lists
 2014-07-14 17:14:15 -06:00
Thomas S Hatch
f871738a5b Merge pull request #14214 from rallytime/dev_requirements_path 
Change requirements path to _requirements.txt
 2014-07-14 17:13:54 -06:00
Mike Place
83ce730ec2 Basic master support for minionswarm 2014-07-14 16:59:44 -06:00
Thomas S Hatch
3590523a94 Merge branch 'rallytime-pylint_fixes' into develop 2014-07-14 16:09:55 -06:00
Thomas S Hatch
fc7ffe7876 Merge branch 'pylint_fixes' of https://github.com/rallytime/salt into rallytime-pylint_fixes 
Conflicts:
	salt/crypt.py
 2014-07-14 16:09:48 -06:00
Thomas S Hatch
09f5ad951b Merge pull request #14210 from pass-by-value/raet_key_test_refactor 
Refactor salt key tests to be raet compatible
 2014-07-14 16:07:43 -06:00
Thomas S Hatch
8435329d91 Merge pull request #14209 from cachedout/master_config 
Small refactor
 2014-07-14 16:06:09 -06:00
Thomas S Hatch
024485fb36 Merge pull request #14204 from terminalmage/docs 
Fix the rest of the double-colons in docs
 2014-07-14 16:01:13 -06:00
Thomas S Hatch
181dfdfb75 Merge pull request #14202 from cachedout/env_test_remove 
pip test fixup and module cleanup
 2014-07-14 16:00:56 -06:00
Thomas S Hatch
d807b30f3f Merge pull request #14194 from makinacorpus/lxc 
lxc: Conservative and explicit network type change
 2014-07-14 15:53:25 -06:00
Thomas S Hatch
1962ad682f Merge pull request #14036 from basepi/2014.1.6docsupdate 
Update docs to 2014.1.7 release
 2014-07-14 15:49:43 -06:00
Thomas S Hatch
1577bf0fad Merge pull request #14178 from khrisrichardson/spelling 
add sphinx spelling extension. enforce en_US
 2014-07-14 15:43:33 -06:00
C. R. Oldham
3f0b561cb4 Next iteration of the Portfile 2014-07-14 15:36:11 -06:00
Thomas S Hatch
d32bfb0fd1 Merge pull request #14156 from YanChii/solaris-smf-fmri 
smf.py: use FMRI instead of SVC in Solaris svcs commands
 2014-07-14 15:26:24 -06:00
Thomas S Hatch
b44a50a2eb We should not be printing in crypt like this, the prints need to be 
in the KeyCLI class
 2014-07-14 15:24:27 -06:00
Thomas S Hatch
746a47f1dc Change all refs from salt.local to salt.var 2014-07-14 15:22:53 -06:00
Khris Richardson
568daa16f6 per excellent suggestion by whiteinge 2014-07-14 16:18:52 -05:00
Chuck Sakoda
ab35081241 removing unused re library 2014-07-14 17:09:28 -04:00
Chuck Sakoda
927523ac13 Merge remote-tracking branch 'upstream/develop' into develop 2014-07-14 17:07:27 -04:00
Chuck Sakoda
bdb7a28f90 merging clouds/ec2 2014-07-14 17:05:18 -04:00
Seth House
39a0b4dfc3 Fix bad global rST links for the mailing lists 2014-07-14 15:04:50 -06:00
Chuck Sakoda
e0bf61daa3 dropping the regex in favor of urlparse 2014-07-14 17:01:37 -04:00
rallytime
e25365ac73 Change requirements path to _requirements.txt 2014-07-14 14:59:06 -06:00
Seth House
caa54c0d28 Merge pull request #14197 from rallytime/requisite_docs 
Requisite documentation
 2014-07-14 14:52:51 -06:00
rallytime
f26ef69514 Change print statements to log statements 2014-07-14 13:58:46 -06:00
Mike Place
457a33d633 Fix test errors 2014-07-14 13:46:45 -06:00
Aditya Kulkarni
91943766d3 Refactor salt key tests to be raet compatible 2014-07-14 15:22:38 -04:00
Mike Place
bed3855f3c Small refactor for config 2014-07-14 12:45:26 -06:00
Joseph Hall
458744db02 Merge pull request #14207 from basepi/configdir14159 
Add configuration file location for minion to minion config doc
 2014-07-14 12:36:19 -06:00
Joseph Hall
d1fa8da34d Merge pull request #14208 from rallytime/pylint_fixes 
Pylint fixes
 2014-07-14 12:35:06 -06:00
C. R. Oldham
a1d7e44d84 Use plists in "pkg/darwin" instead 2014-07-14 12:26:38 -06:00
rallytime
43bd955096 Pylint fixes 2014-07-14 12:23:52 -06:00
Colton Myers
08d7847e44 Add configuration file location for minion (and FreeBSD for master) 2014-07-14 12:22:27 -06:00