Colton Myers
|
cb8bf91944
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/ref/configuration/master.rst
doc/topics/cloud/linode.rst
salt/cloud/clouds/linode.py
salt/modules/rh_ip.py
salt/renderers/pyobjects.py
salt/states/file.py
|
2016-01-21 17:42:50 -07:00 |
|
Jorge Schrauwen
|
2ad5fc1a75
|
enable doc generation for solaris_system
|
2016-01-21 19:40:44 +00:00 |
|
Jacob Hammons
|
2b7f96bf0e
|
Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron
|
2016-01-19 21:57:45 -07:00 |
|
rallytime
|
3288ff104d
|
Remove fsutils references from modules list
Fixes #22820
|
2016-01-19 14:41:02 -07:00 |
|
Jorge Schrauwen
|
f5333ee2f8
|
salt.modules.fmadm still does not have docs generated, trying again
|
2015-12-22 19:08:22 +00:00 |
|
Colton Myers
|
95fe811724
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/minion.py
salt/modules/network.py
salt/scripts.py
salt/states/file.py
salt/states/git.py
salt/utils/event.py
|
2015-12-18 15:00:24 -07:00 |
|
Mike Place
|
fb4eb28645
|
Merge pull request #29819 from rallytime/esxi-docs
Add esxi module and state to docs build
|
2015-12-18 09:20:27 -07:00 |
|
Eric Mosher
|
0a765de370
|
Add infoblox documentation
Closes #29780
|
2015-12-17 23:01:55 -05:00 |
|
Thibault Cohen
|
d37064951d
|
Add k8s modules and states documentation
|
2015-12-17 21:44:49 -05:00 |
|
rallytime
|
e7c5863468
|
Add esxi module and state to docs build
Also fixed some minor doc errors
|
2015-12-17 16:33:59 -07:00 |
|
rallytime
|
3b7f5540ec
|
Add vSphere module to doc ref module tree
|
2015-12-17 10:54:28 -07:00 |
|
Erik Johnson
|
2461552a06
|
Hide aliased function
|
2015-12-07 15:20:51 -06:00 |
|
Jorge Schrauwen
|
ed95e84b2b
|
generate docs for fmadm module
|
2015-11-25 14:43:38 +00:00 |
|
rallytime
|
d31b0d1573
|
Merge branch '2015.8' into develop
|
2015-11-04 15:40:03 -07:00 |
|
Benjamin Drung
|
8edd2c1add
|
Fix typos of dependency
|
2015-11-04 10:58:40 +01:00 |
|
Colton Myers
|
a471832fa7
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/ec2.py
salt/config/__init__.py
salt/modules/git.py
salt/modules/hosts.py
salt/modules/htpasswd.py
salt/states/boto_secgroup.py
salt/states/htpasswd.py
tests/unit/modules/schedule_test.py
|
2015-10-20 18:13:11 -06:00 |
|
C. R. Oldham
|
3712066fc9
|
More docs.
|
2015-10-19 13:19:20 -06:00 |
|
C. R. Oldham
|
4ce2f8bb11
|
Documentation.
|
2015-10-16 16:52:14 -06:00 |
|
Richard Hansen
|
39abc94739
|
new ldap3 execution module
This is an alternative to the existing ldapmod module.
|
2015-10-09 17:47:56 -04:00 |
|
Colton Myers
|
9128e8e7ae
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
|
2015-10-07 13:14:28 -06:00 |
|
Colton Myers
|
69d960f8e6
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
|
2015-10-07 13:11:48 -06:00 |
|
Colton Myers
|
35425b14ad
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/modules/pip.py
salt/states/user.py
|
2015-10-07 12:06:12 -06:00 |
|
Justin Findlay
|
03400ef45b
|
fix virtual fcn return doc indentation
Fixes #27724.
|
2015-10-07 11:49:16 -06:00 |
|
Jacob Hammons
|
75cc07cf10
|
noted that __virtual__ can return False and an error string
|
2015-10-07 09:48:46 -06:00 |
|
Jacob Hammons
|
b928e1afa8
|
update docs for __virtual__ and __virtualname__
Refs #26673
|
2015-10-06 17:23:42 -06:00 |
|
Justin Findlay
|
6bddf80546
|
update __virtual__ return documentation
Related to #26755; fixes #27116; implements part of #27643.
|
2015-10-06 13:47:31 -06:00 |
|
Jacob Hammons
|
76dc8de71b
|
Assorted doc bugs
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
|
2015-10-05 17:37:13 -06:00 |
|
Jacob Hammons
|
5a9867aad1
|
initial engines topic, updates to windows repo docs
Refs #23239
Refs #27520
|
2015-10-05 14:22:59 -06:00 |
|
Colton Myers
|
ec6cd80496
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/man/salt.7
doc/ref/auth/all/index.rst
doc/ref/auth/all/salt.auth.rest.rst
doc/ref/beacons/all/index.rst
doc/ref/beacons/all/salt.beacons.ps.rst
doc/ref/pillar/all/index.rst
doc/ref/pillar/all/salt.pillar.consul_pillar.rst
doc/ref/pillar/all/salt.pillar.neutron.rst
doc/ref/pillar/all/salt.pillar.sql_base.rst
doc/ref/pillar/all/salt.pillar.sqlite3.rst
doc/ref/sdb/all/salt.sdb.rest.rst
salt/modules/rh_ip.py
salt/utils/http.py
|
2015-09-22 15:31:46 -06:00 |
|
Jacob Hammons
|
7ac98a03b6
|
Updated module doc index using https://github.com/saltstack/salt/pull/27203
|
2015-09-22 11:54:34 -06:00 |
|
Arnold Bechtoldt
|
3a7d31a91c
|
add missing module references
|
2015-09-20 13:22:32 +02:00 |
|
Colton Myers
|
9864d9e0fa
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/ref/modules/all/index.rst
doc/topics/releases/boron.rst
salt/cli/daemons.py
salt/cli/salt.py
salt/modules/jboss7.py
salt/states/file.py
|
2015-09-18 11:03:37 -06:00 |
|
Colton Myers
|
8c204a45ab
|
Merge pull request #27197 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
|
2015-09-17 13:53:22 -06: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
|
2c2a5f85ac
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/conf.py
doc/topics/cloud/gce.rst
salt/cli/api.py
salt/cli/call.py
salt/cli/cp.py
salt/cli/key.py
salt/cli/run.py
salt/cli/salt.py
salt/modules/dockerio.py
salt/states/dockerio.py
|
2015-09-17 10:54:33 -06:00 |
|
Jacob Hammons
|
f7a9e25d52
|
Fixed sphinx / latex build warnings and errors
Added missing modules to contents
|
2015-09-17 09:23:24 -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
|
6e323b6dd3
|
Update latest to 2015.8, 2015.5 is now previous
Assorted style and minor updates
|
2015-09-14 16:32:22 -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 |
|