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
Justin Findlay
0d62d3470c
Merge pull request #27111 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-15 01:29:30 -06:00
Jacob Hammons
d939a38c8c
release notes updates
2015-09-14 14:52:14 -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
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -06:00
Jacob Hammons
ac3bd47440
states/pkgrepo examples, suse installation updates
...
Refs #26644
Refs #26638
2015-09-02 11:37:40 -06:00
Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Colton Myers
278e8dda5b
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
2015-09-01 15:15:13 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
06ac3bed42
Fixed typo
2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543
Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
...
Refs #21214
2015-08-31 13:51:31 -06:00
Jeremy Rosenbaum
763ee20713
documentation for zip archive modules
2015-08-26 12:18:57 -06:00
Colton Myers
9159800ce8
Merge pull request #26583 from jodv/zip_modules
...
Using .zip archives as self-contained Salt modules
2015-08-25 15:33:10 -06:00
Jeremy Rosenbaum
b122adcf45
documentation for zip archive modules
2015-08-24 10:51:17 -07:00
Ryan Lane
241c76d60a
Add netaddress module for getting info about IP networks
2015-08-21 12:15:11 -07:00
Colton Myers
73282d51cc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cli/daemons.py
salt/master.py
salt/minion.py
salt/modules/gpg.py
salt/modules/pw_group.py
salt/utils/http.py
setup.py
tests/unit/modules/schedule_test.py
2015-08-19 11:29:45 -06:00
Erik Johnson
56fc78de80
Hide aliased funcs from docs
2015-08-17 17:29:13 -05:00
Ryan Lane
b2a179fc1e
Add missing module docs
2015-08-04 16:33:37 -07:00
Seth Miller
95c0935b06
Add zenoss state and execution modules
...
This change adds support for the Zenoss monitoring tool.
The execution module provides support for adding a new device and checking if a device is already in Zenoss.
The state module provides the abililty to set a state of 'monitored' which requires that a device be added to Zenoss.
Tested with Zenoss 4.2.5 Enterprise and likely will work with all in the 4.x series including Core.
2015-07-22 14:58:28 -05:00
Seth House
1210a53685
Add all new modules to autosummary docs
2015-07-17 15:53:13 -06:00
Jacob Hammons
859530397a
Add win_wua module to doc index
2015-07-10 09:54:08 -06:00
Mark Lee
acc13b657f
Fix typos in execution module docs
2015-07-05 18:04:06 -07:00
Arnold Bechtoldt
689ba5686b
add missing module documentation to references
2015-06-27 19:12:50 +02:00
Mike Place
fbea069319
Remove duplicate func doc
...
Closes #23613
2015-06-25 15:48:44 -06:00
Jacob Hammons
f3f34ddff6
2015.5.2 release changes
...
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Colton Myers
6d503c12ea
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/modules/all/salt.modules.system_profiler.rst
salt/fileclient.py
salt/loader.py
salt/modules/tls.py
salt/modules/win_path.py
salt/states/pkg.py
salt/utils/event.py
salt/utils/pagerduty.py
tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9
Salt cloud doc updates, build errors and bug fixes
...
Refs #24309
2015-06-04 16:42:47 -06:00
Arnold Bechtoldt
fc7f0724d3
add missing module documentation to references
2015-06-04 21:17:24 +02:00
Ryan Lane
a3924bba0e
Add boto_kms docs
2015-06-03 15:18:52 -07:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Nitin Madhok
12ea8f5c52
Fixing more sphinx/docs errors and warnings
2015-05-16 19:24:04 -04:00
Daniel Hobley
899ba78e79
Added power cfg module and state for windows minions
...
- Allows you to set power settings on a windows minion for things like the monitor and disk
2015-05-12 14:49:48 +02:00
Jacob Hammons
16d8a753ad
saltstack2 sphinx theme and build settings
2015-05-11 17:29:12 -06:00
Thomas S Hatch
1a93deaf17
Merge pull request #23275 from terminalmage/issue5504
...
Add pkg.group_installed state
2015-05-02 18:41:39 -06:00
Seth House
cda915bcd4
Remove fsutils module documentation
...
This module was moved to the utils folder in #17883 .
2015-05-01 14:13:59 -06:00
Erik Johnson
282ec1b8ec
Exclude groupinstall alias from docs
2015-05-01 13:38:45 -05:00
Seth House
767c328420
Remove docs for old nagios_json module
2015-04-15 17:52:06 -06:00
Seth House
4cb33c92d6
Added autodoc generated pages for the new modules types
2015-04-03 12:45:49 -06:00
Seth House
ef3893d4de
Updated module index pages for each of the module types
2015-04-03 12:39:13 -06:00
Clint Armstrong
2fd9cf70be
Merge branch 'develop' into x509
2015-03-31 11:29:46 -04:00
Erik Johnson
2e823b84e8
Add docker-ng module
2015-03-29 12:32:07 -05:00
Erik Johnson
f7e6523461
Add dockerng execution module docs to toctree
2015-03-29 12:32:07 -05:00
Erik Johnson
6846d3e01b
Update the exclude-members for lxc module
2015-03-29 12:32:07 -05:00
Erik Johnson
d9f0273680
Update the exclude-members for nspawn module
2015-03-29 12:32:07 -05:00
Clint Armstrong
aab3d37314
added module to doc index
2015-03-26 13:22:26 -04:00
Arnold Bechtoldt
db38f80945
update references, fixes #21879
2015-03-22 10:16:41 +01:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Thomas Jackson
b8e39c13f9
Add docs for new raw boolean support of depends decorator
2015-03-05 22:02:34 -08:00
