valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,550 Commits 24 Branches 182 Tags 341 MiB
94cb2f4161
Commit Graph

3581 Commits

Author SHA1 Message Date
Martyn Smith
a899af7418 Fix example command to one that exists 
Fix walkthrough to use disk.usage instead of disk.percent (which doesn't appear to exist any more).
 2014-10-21 09:51:54 +13:00
Thomas S Hatch
3cf0cfb61d Merge branch '2014.7' into develop 2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Erik Johnson
90ba9b8a43 Add notice that per-remote auth params are not supported in GitPython 2014-10-18 17:36:51 -05:00
Thomas S Hatch
2e9b63ed31 Add notes on cp module and -W/w 2014-10-18 09:24:31 -06:00
Thomas S Hatch
7a72ef2e27 Merge pull request #16688 from Supermathie/16682 
Add documentation addressing how to listen for events on minion
 2014-10-17 10:51:57 -06:00
Seth House
4846dcebbd Update the Reactor docs to use the local method instead of cmd 2014-10-17 09:17:34 -05:00
Mike Place
a3aa876008 Merge pull request #16697 from cachedout/ssh_timeout_doc_fix 
Clarify doc
 2014-10-16 16:10:27 -06:00
Mike Place
36288eef7f Clarify doc 2014-10-16 16:09:57 -06:00
Michael Brown
53e5b9ee09 Add documentation addressing how to listen for events on minion 
* Address #16682
 2014-10-16 14:55:34 -04:00
Erik Johnson
48e81ac32d Add new fileserver features to helium release notes 
Also made some formatting fixes
 2014-10-15 22:44:43 -05:00
Erik Johnson
49c7e6ac1a Fix misspelled code-block type 2014-10-15 22:44:27 -05:00
Erik Johnson
00bd8477dd Fix sphinx build error 
There is no 'math' lexer in sphinx.
 2014-10-15 22:43:37 -05:00
Erik Johnson
bb6de490ef Grammar correction 2014-10-15 22:36:12 -05:00
Seth House
fc28d00056 Added SaltConf15 banner and links to sidebar 2014-10-14 19:44:36 -05:00
Mike Place
d0e90c77a6 Typo fix 2014-10-14 13:18:54 -06:00
Mike Place
0fcc0b5ae7 Document pillar ovewrite strategy 2014-10-14 13:07:26 -06:00
Thomas S Hatch
9ec90bafea Merge branch '2014.7' into develop 
Conflicts:
	salt/output/__init__.py
 2014-10-13 17:41:42 -06:00
Thomas Jackson
e60f47052e Update ACL docs to include @jobs markup 2014-10-13 16:13:23 -07:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Stephen Wood
1be08146c8 Fix minor typos. 2014-10-11 17:03:38 -07:00
Joseph Hall
130e0842c8 Merge pull request #16566 from terminalmage/docs 
Minor wording fix in highstate docs
 2014-10-11 06:34:39 -06:00
Erik Johnson
af64f17fe4 Minor wording fix in highstate docs 
This fixes some grammar weirdness.
 2014-10-10 22:25:55 -05:00
rallytime
54b7abdb17 Fix conf_minion references 2014-10-10 09:19:27 -06:00
Joseph Hall
f49647a4e2 Merge pull request #16486 from rallytime/docs_minion_config 
Add recon_* config options to minion docs
 2014-10-09 17:08:29 -06:00
Nicole Thomas
2901e9439b Merge pull request #16514 from cachedout/master_doc_fix 
Small doc fixes
 2014-10-09 15:07:17 -06:00
Mike Place
11ef20fdf5 Small doc fixes 2014-10-09 10:14:37 -06:00
Thomas S Hatch
fecb0dfebb Merge pull request #16497 from thatch45/notes_2014.7 
Add some release notes updates
 2014-10-08 17:30:43 -06:00
Thomas S Hatch
678a551783 Add soem release notes updates 2014-10-08 16:40:34 -06:00
Seth House
57f2c4a4e3 Merge pull request #16494 from terminalmage/zeromq4 
Add information on how to upgrade to ZeroMQ 4 in Ubuntu and RHEL/CentOS
 2014-10-08 16:06:37 -06:00
Erik Johnson
8c80efd8eb Add info on upgrading to ZeroMQ 4 2014-10-08 16:56:28 -05:00
Erik Johnson
391a07e6ac Add info on upgrading to ZeroMQ 4 2014-10-08 16:51:33 -05:00
Erik Johnson
6ac209e6a7 Add example states for installing at and running atd 2014-10-08 16:50:47 -05:00
Colton Myers
710795b3b3 Merge pull request #16492 from saltstack/2014.7 
Merge forward 2014.7 into develop
 2014-10-08 15:25:56 -06:00
Colton Myers
5e25de90e9 Add 2014.1.12 release notes 2014-10-08 15:22:33 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
rallytime
6d1c14b1be Add recon_* config options to minion docs 
Fixes #16471
 2014-10-08 14:11:34 -06:00
Elias Probst
6a2936886f Fix again what was supposed to be fixed in PR#14101. 
The initial problem was, that the <li> elements for the JS-generated
TOC weren't placed inside <ul></ul>, but after it.
 2014-10-08 17:23:22 +02:00
Colton Myers
000b391f2f State Module, not State Declaration 2014-10-07 19:25:44 -06:00
Colton Myers
71f422fd4d Merge branch '2014.7' into develop 2014-10-07 15:10:40 -06:00
Colton Myers
059416e75b Update release candidate installation instructions for rc3 2014-10-07 15:09:16 -06:00
Colton Myers
8133d7d5c6 Update to 2014.1.11 in docs sidebar 2014-10-07 15:08:32 -06:00
Colton Myers
e1d2d7cb6b Update to rc3 in docs sidebar 2014-10-07 15:08:21 -06:00
David Boucha
8464201a71 add links to Windows 2014.1.11 installers 2014-10-07 11:52:53 -06:00
Thomas S Hatch
d4eaf2323e Merge pull request #16339 from cachedout/module_fail_reasons 
Module failure reporting
 2014-10-07 10:21:37 -06:00
Erik Johnson
cd1cce3baa Merge pull request #16400 from steverweber/doc_ipython 
ipython log to look for
 2014-10-06 22:07:41 -05:00
Mike Place
450ffb1c77 Merge branch 'develop' into module_fail_reasons 2014-10-06 11:09:02 -06:00
Thomas S Hatch
69b6a1c313 Merge branch '2014.7' into develop 2014-10-06 11:02:27 -06:00
Steve Weber
54b9aedbf7 ipython log to look for 2014-10-06 12:54:36 -04:00