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
60,816 Commits 24 Branches 182 Tags 341 MiB
0188a9ba4f
Commit Graph

58 Commits

Author SHA1 Message Date
Steve Hajducko
5ff8a83009 Clarify argument usage for runners in reactors 
Clarified that positional arguments don't work in runners currently and
that you must use keyword args. Fixes #27770

Also, modified the link to point at the function the example shows,
rather than the previous example.
 2015-10-09 21:22:54 -07:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Jacob Hammons
2401533d9e New content added to beacon docs. 2015-09-09 11:16:55 -06:00
rallytime
0214daad19 Fix a couple of typos in reactor docs 2015-09-08 14:52:38 -06:00
Colton Myers
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
 2015-08-21 16:44:59 -06:00
Arthur Lutz
0976b1e23b [doc] reactor documentation fix : returners 2015-08-21 09:46:04 -06:00
Arthur Lutz
337b466b11 [doc] reactor documentation fix : returners 2015-08-21 11:45:39 +02:00
David Ward
7b8096b945 Grammar fix. 2015-07-27 17:02:31 +10:00
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Vladimir Pouzanov
921aaea9b4 Fixed a Runenr typo in the docs 2015-05-03 18:47:15 +01:00
Seth House
35c91881ab Added note about debugging reactor files to see the rendered output 2015-04-28 14:48:38 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Seth House
a8bdc17bbf Better explanations and more examples of how the Reactor calls functions 
Refs #20841
 2015-04-02 17:07:22 -06:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2 
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
 2015-02-18 11:33:10 -07:00
Seth House
37017a54be Replace doc examples for event.fire_master with event.send 2015-02-12 17:28:21 -07:00
Seth House
f0b5ddb77d Updated Reactor docs to reference state.event instead of eventlisten 
Easier than downloading an external script.
 2015-02-12 17:24:22 -07:00
Thomas Jackson
498a612078 Whitespace cleanup 
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
 2014-12-11 07:53:19 -08:00
JP Viljoen
6f3a1ab7b3 [docs] fix minor typo 2014-12-07 10:24:49 +02:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
Seth House
1faec87514 Added versionadded and versionchanged directives to Reactor docs 
Also reworded and cross-linked the client interfaces docs.
 2014-10-22 15:07:05 -06: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
Seth House
4846dcebbd Update the Reactor docs to use the local method instead of cmd 2014-10-17 09:17:34 -05:00
Valentin Bud
d0e962c832 Use custom returner from a reactor. 2014-09-10 10:00:06 +03:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Seth House
c05f250d96 Add salt:// paths for reactor files to the doc examples 2014-08-20 21:14:29 -06:00
Seth House
30e8fb653a Line up comments in reactor example 2014-08-20 21:14:29 -06:00
Seth House
2cd0fa6223 Document that globs can be used in reactor filenames 2014-08-20 21:14:29 -06:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Erik Johnson
7dc67a7ce8 Convert :: to code-block 2014-07-06 16:43:51 -05:00
Erik Johnson
1b9660a40a Fix 2nd person 2014-07-01 23:42:03 -05:00
Erik Johnson
cf7f06f8f9 Remove duplicate word 2014-06-09 01:49:09 -05:00
Erik Johnson
3ca776a167 Add reactor example for syncing custom types on initial highstate 2014-06-07 14:27:26 -05:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Seth House
cf31e51e2b Tidied up the index entries for the Reactor 2014-04-29 20:06:50 -06:00
David Lindquist
1937eb85af Update all raw.github.com references to raw.githubusercontent.com 
Per
https://developer.github.com/changes/2014-04-25-user-content-security/
raw.github.com is now served from raw.githubusercontent.com.
 2014-04-29 14:29:34 -07:00
Seth House
1b77405351 Improved Reactor example of passing pillar data through to state.sls 
No need for crazy string building and parsing here. Just pass a
dictionary!
 2014-03-25 15:35:52 -06:00
Seth House
fe5abd4ad2 Added index entries for the Reactor and events 2014-03-01 23:21:12 -07:00
Seth House
b9e9912d63 Added a rST anchor for the Reactor docs 2014-01-30 11:49:38 -07:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi 
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
 2014-01-26 18:41:28 -08:00
Seth House
3fffbbaa09 Added section on debugging the reactor 2014-01-23 10:34:33 -07:00
Michael Lustfield
e9f500bcfe Made two blocks into code blocks. 2013-12-20 12:40:13 -06:00
Michael Lustfield
66286c8a86 Added example for using the reactor system. 2013-12-20 12:26:25 -06:00
Michael Lustfield
8569a84f1c Added information about eventlisten.py 2013-12-20 12:25:29 -06:00
David Boucha
85cff94b56 Update Reactor docs 2013-11-26 10:21:57 -07:00
David Boucha
17924e89a2 fix typo 2013-11-26 09:06:48 -07:00
Seth House
5f63035e36 Added example of passing Reactor event data through to a state run 
Bonus: this example is only a tiny bit convoluted and semi-plausible!
 2013-11-20 20:23:31 -08:00
Dan Garthwaite
eb85b12153 ReStructure doesn't req * to be escaped in blockquotes. 2013-10-28 11:55:31 -04:00
Dan Garthwaite
ff242cc482 Tying tags and events to state files wasn't clear to me. 
Also some typoes and escaping '*' chars.
 2013-10-28 11:43:59 -04:00
hvnsweeting
66e7f305e8 add doc on fire an event, add commas to improve readability 2013-08-29 14:11:43 +07:00