valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,988 Commits 24 Branches 182 Tags 341 MiB
c25e658420
Commit Graph

33988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
c25e658420 Use the test suite __opts__ instead of custom dict 
Better approach now that we're in Salt core.
 2014-07-14 17:09:25 -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
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
Seth House
caa54c0d28 Merge pull request #14197 from rallytime/requisite_docs 
Requisite documentation
 2014-07-14 14:52:51 -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
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
Thomas S Hatch
d2ca043327 Merge pull request #14195 from felskrone/master_signing_tutorial 
Master signing tutorial
 2014-07-14 11:17:16 -06:00
Joseph Hall
b3b9285316 Merge pull request #14199 from nyx/patch-1 
pass os_auth_plugin into SaltNova
 2014-07-14 11:15:14 -06:00
Samuel Smith
31e64679e9 Merge pull request #14200 from SmithSamuelM/sam_raet_50 
Added support for locally setup LaneStack for Raet Channel needed by Salt-Call
 2014-07-14 10:54:04 -06:00
Samuel M Smith
99ad77e5c9 Added support for locally created transport raet channel LaneStack 
this is needed for salt-call
 2014-07-14 10:50:34 -06:00
Andrew Andkjar
8888ecc8d1 pass os_auth_plugin into SaltNova 
without this parameter I was unable to authenticate with Rackspace
 2014-07-14 12:47:59 -04:00
Thomas S Hatch
35ecf60198 Merge pull request #14087 from felskrone/salt-key_gen_signature 
Salt key gen signature
 2014-07-14 10:44:13 -06:00
rallytime
f295b9b60b Fix requisite documentation links 2014-07-14 10:33:02 -06:00
Samuel M Smith
800c262a0b Added local creation of raet channel stack if not already created 
Merge remote-tracking branch 'upstream/develop' into sam_raet_50

Conflicts:
	salt/transport/__init__.py
 2014-07-14 10:15:09 -06:00
rallytime
29c6171af5 Fix "here" link on requisites doc 2014-07-14 10:13:27 -06:00
Samuel M Smith
d9888a9f33 Added setup_jobber_stack to raet channel 2014-07-14 10:08:07 -06:00
Thomas S Hatch
a7af7551ec Merge pull request #14191 from makinacorpus/fp 
cmd: do not use VT for unless/onlyif
 2014-07-14 09:57:24 -06:00
Volker Schwicking
d7b46395ff headings increased 2014-07-14 17:32:16 +02:00
Volker Schwicking
0f984aaf26 rewording, re-formatting 2014-07-14 17:21:12 +02:00
Mathieu Le Marec - Pasquet
f24abd047c cmd: do not use VT for unless/onlyif 2014-07-14 16:07:38 +02:00
Joseph Hall
d7ebb8a606 Merge pull request #14186 from graingert/patch-1 
Document requirements argument
 2014-07-14 05:13:44 -06:00
Joseph Hall
6e8ba25f70 Merge pull request #14182 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #112
 2014-07-14 05:12:54 -06:00
Thomas Grainger
05684180ca Document requirements argument 2014-07-14 11:45:16 +01:00
Khris Richardson
8cc15ebe6b minor 2014-07-13 21:27:21 -05:00
Pedro Algarvio
d8a4e5bc9d Update 'doc/.tx/config' - Build #112 
http://cookingwithsalt.org/job/salt/job/transifex/112/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-14 00:38:58 +01:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Joseph Hall
9ef1d157de Merge pull request #14177 from terminalmage/docs 
Docs cleanup
 2014-07-13 10:48:12 -06:00
Erik Johnson
2849950bce Docs cleanup 
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
 2014-07-13 11:02:33 -05:00
Erik Johnson
16d59eb135 Fix rst note:: directives 2014-07-13 10:40:53 -05:00
Joseph Hall
3c1a574d47 Merge pull request #14168 from s0undt3ch/hotfix/remove-syslog-ng 
Remove syslog-ng tests. Refs #14163
 2014-07-13 09:17:18 -06:00
Pedro Algarvio
cb3d82bbd2 Merge pull request #14174 from UtahDave/develop 
make docs reflect argument order in function spec
 2014-07-13 11:14:34 +01:00
David Boucha
a8a1334a1d make docs reflect argument order in function spec 2014-07-13 02:36:29 -06:00
David Boucha
8992ee5da1 Merge pull request #14172 from UtahDave/develop 
make sure twilio_notify shows up in the docs
 2014-07-13 00:13:20 -06:00
David Boucha
a04e3d4a0b make sure twilio_notify shows up in the docs 2014-07-13 00:12:23 -06:00
David Boucha
66c55704e6 Merge pull request #14171 from UtahDave/develop 
add links to 2014.1.7 Salt Windows installers
 2014-07-12 23:21:57 -06:00
David Boucha
98b7c1cdfd add links to 2014.1.7 Salt Windows installers 2014-07-12 23:21:06 -06:00
David Boucha
357283717f Merge pull request #14170 from UtahDave/develop 
bump windows installer version
 2014-07-12 23:19:50 -06:00
David Boucha
ea12719881 bump windows installer version 2014-07-12 23:18:58 -06:00
Joseph Hall
a2cbd18b7f Merge pull request #14169 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #111
 2014-07-12 22:26:23 -06:00
Pedro Algarvio
8c756836f2 Update 'doc/.tx/config' - Build #111 
http://cookingwithsalt.org/job/salt/job/transifex/111/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-13 00:43:56 +01:00
Pedro Algarvio
7862600683 Remove syslog-ng tests. Refs #14163 2014-07-13 00:09:45 +01:00
Thomas S Hatch
4232835ee8 Merge pull request #14165 from saltstack/revert-14137-lxc 
Revert "lxc refactor"
 2014-07-12 11:38:16 -06:00
Thomas S Hatch
7e54d0fa20 Revert "lxc refactor" 2014-07-12 11:38:03 -06:00
Thomas S Hatch
e8e6211fe8 Merge pull request #14163 from terminalmage/move-syslog-ng-to-salt-contrib 
Remove syslog_ng state/module, moving to salt-contrib
 2014-07-12 10:49:32 -06:00
Erik Johnson
5a71057d29 Remove syslog_ng state/module, moving to salt-contrib 2014-07-12 11:36:17 -05:00