Commit Graph

11 Commits

Author SHA1 Message Date
Joseph Hall
dde48b3650 Add event_filter to salt cloud 2017-03-13 15:36:13 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply
Resolves #32037.
2016-03-21 22:56:17 -05:00
rallytime
0214daad19 Fix a couple of typos in reactor docs 2015-09-08 14:52:38 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs.
Refs #24797
2015-08-10 09:20:26 -06:00
Julien Barbot
6d7e779e62 Fix typo in salt-cloud reactor section 2015-06-24 16:40:32 +02:00
rallytime
0dba3feb63 Change provider config refernces to driver in docs 2015-06-17 16:41:03 -06: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
Dylan Fitzgerald
611baf468a Correct data in /srv/reactor/startup_highstate.sls
data['id'] does not exist; data['name'] does. revise example sls to render correctly.
2014-11-05 13:23:43 -07:00
Joseph Hall
d65d12a460 Correct formatting of PagerDuty 2014-10-02 13:27:13 -06:00
Joseph Hall
dc88103cdf Add tutorial on using Salt Cloud with the Event Reactor 2014-09-30 12:50:47 -06:00