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
37,679 Commits 24 Branches 182 Tags 341 MiB
5ec98a7c4f
Commit Graph

3517 Commits

Author SHA1 Message Date
Chris Rebert
5ec98a7c4f fix typos in doc/ref/configuration/master.rst 2014-10-01 14:06:11 -07:00
Joseph Hall
4aadff6d2b Add Reactor tutorial to index 2014-09-30 12:57:48 -06:00
Joseph Hall
dc88103cdf Add tutorial on using Salt Cloud with the Event Reactor 2014-09-30 12:50:47 -06:00
Thomas S Hatch
3e204c16f3 Merge branch '2014.7' into develop 2014-09-29 20:07:01 -06:00
Thomas S Hatch
ea5c8518db Merge pull request #16246 from rallytime/pillar_docs 
Add note on how to set pillar data on the command line to pillar tutorial
 2014-09-29 20:03:47 -06:00
Thomas S Hatch
3ace3e1405 Merge pull request #16241 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #166
 2014-09-29 20:02:59 -06:00
Thomas S Hatch
471efd9236 Merge pull request #16217 from trebuchet-deploy/use-master-when-local-option 
Add a use_master_when_local option to allow remote execution while using...
 2014-09-29 19:56:08 -06:00
Thomas S Hatch
49b3646ad6 Merge pull request #16211 from rallytime/runtests_doc 
Add info about running unittests w/o integration test daemons
 2014-09-29 19:51:05 -06:00
Ed Kern
3933cdb72a pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 16:21:08 -06:00
rallytime
38db7b7d5e Add note on how to set pillar data on the command line to pillar tutorial 
Closes #14217
 2014-09-29 16:04:30 -06:00
Pedro Algarvio
7763c3bd53 Update 'doc/.tx/config' - Build #166 
http://cookingwithsalt.org/job/salt/job/transifex/166/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-09-29 21:34:48 +01:00
Ed Kern
93b0c1f80e pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 12:27:08 -07:00
Joseph Hall
eed588f65b Merge pull request #16219 from steverweber/develop 
remove s in clouds
 2014-09-29 07:09:58 -06:00
Steve Weber
8290a473ca remove s in clouds 
fix var name
 2014-09-29 09:05:15 -04:00
Ryan Lane
9eacaf1832 Add a use_master_when_local option to allow remote execution while using a local file_client 2014-09-28 18:53:43 -07:00
rallytime
0b99acc381 Add info about running unittests w/o integration test daemons 2014-09-28 10:52:37 -06:00
Pedro Algarvio
7c3a1375c1 Merge pull request #16203 from techhat/microinstance 
Get rid of Micro Instance examples
 2014-09-27 20:59:06 +01:00
Erik Johnson
18456b6bbf Spelling and formatting fixes 2014-09-27 12:14:12 -05:00
Joseph Hall
9d6e4ff168 Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
Erik Johnson
7782fc7146 Merge branch 'doc_debug' of https://github.com/steverweber/salt into steverweber-doc_debug 2014-09-27 11:41:01 -05:00
Steve Weber
ca2841a7ec Update modular_systems.rst 2014-09-27 12:22:47 -04:00
Steve Weber
b6d2f6966a using ipython 
small fix
 2014-09-27 12:18:46 -04:00
Steve Weber
d444d833ce add some help using an interactive cli debugger 
when hacking some tricky code i find using ipython productive.
 2014-09-27 12:10:22 -04:00
Thomas S Hatch
999d695d8f Merge branch '2014.7' into develop 
Conflicts:
	salt/output/key.py
 2014-09-26 14:54:00 -06:00
Thomas S Hatch
3d71639df4 Merge pull request #16161 from KennethWilke/develop 
corrected master jobs path in clientacl doc
 2014-09-26 14:49:53 -06:00
Steve Weber
88f28b90fb doc fix 
doc fix
 2014-09-26 09:28:16 -04:00
Erik Johnson
1a88ebf1f8 Update docs reference to Halite 
Halite is no longer "new", and shouldn't be referred to as such.
 2014-09-25 23:54:59 -05:00
KennethWilke
0a4f3ad098 corrected master jobs path in clientacl doc 2014-09-25 16:07:28 -05:00
Thomas S Hatch
bc2a897c3e Merge pull request #16063 from jacksontj/2014.7 
2014.7 RC fixes/backports
 2014-09-25 09:03:06 -06:00
Mike Place
6b729074a0 Fix broken link 
Resolves #16112
 2014-09-24 15:12:47 -06:00
Thomas S Hatch
3ce955c774 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
 2014-09-24 12:46:37 -06:00
Nitin Madhok
b7f43d34f8 Update instances of install_salt.sh.sh 2014-09-24 12:16:48 -04:00
Erik Johnson
a4413bb27a Improve formatting 
Bullet points look better here than an indented section with an enormous
font.
 2014-09-23 20:58:26 -05:00
Thomas Jackson
6225ae5145 Remove "never timeout" feature 2014-09-23 14:13:44 -07:00
Thomas Jackson
2075fcde77 Update docs 2014-09-23 14:13:35 -07:00
Thomas Jackson
4fac8f7d22 Add master_id to master docs 2014-09-23 14:11:51 -07:00
Thomas S Hatch
3f82e3664a Merge branch '2014.7' into develop 2014-09-23 14:41:58 -06:00
rallytime
872b312770 Clarify unless and onlyif docs 2014-09-22 16:03:04 -06:00
vs
94948047cf add rotate_aes_key documentation to master-configuration reference 2014-09-22 14:43:59 -06:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
Thomas Martin
7cc5446484 Fix incorrect path in Pillar documentation 2014-09-22 09:04:48 +02:00
Thomas S Hatch
f331d977d5 Merge pull request #15938 from babilen/doc/req_indent 
Fix indentation errors and inconsistencies
 2014-09-19 09:42:00 -06:00
Thomas S Hatch
b5d92a4018 Salt ssh is no longer beta 2014-09-18 15:47:17 -06:00
Thomas S Hatch
d88ceab872 Merge pull request #15917 from felskrone/fix_key_rotation 
Rename key_no_rotate to rotate_aes_key
 2014-09-18 14:14:18 -06:00
Wolodja Wentland
3925df10d3 Fix indentation errors and inconsistencies 
Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
 2014-09-18 21:02:56 +02:00
vs
ae07fe381b add documentation for the con_cache setting in master config 2014-09-18 14:26:49 +02:00
vs
da78c38b97 add rotate_aes_key documentation to master-configuration reference 2014-09-18 13:57:38 +02:00
Thomas S Hatch
f66d706154 Merge pull request #15896 from terminalmage/fix-sphinx 
Fix sphinx build errors
 2014-09-18 00:34:28 -06: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