salt/doc/ref
rallytime 4fa80f2d5e Merge branch '2015.8' into 'develop'
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
2016-01-26 16:19:39 -07:00
..
auth/all Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-22 15:31:46 -06:00
beacons/all Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
cli Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
clients Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-09-14 14:39:03 -06:00
clouds/all Updates made after PR review: 2016-01-25 18:02:10 +00:00
configuration Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:57:39 -07:00
engines/all Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
file_server doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
internals Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
modules Merge branch '2015.8' into 'develop' 2016-01-26 16:19:39 -07:00
netapi/all Remove internal APIs from rest_cherrypy docs. 2015-12-28 15:26:16 -07:00
output/all Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
pillar Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
proxy/all Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
queues/all Merge branch '2015.8' into 'develop' 2016-01-26 16:19:39 -07:00
renderers Allow parent relative includes in state files 2015-07-21 16:32:38 +10:00
returners Fixed sphinx / latex build warnings and errors 2015-09-17 09:23:24 -06:00
roster/all Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
runners Presumably what was meant 2015-12-21 21:17:23 +00:00
sdb/all Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-09-22 15:31:46 -06:00
serializers/all Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
states Merge branch '2015.8' into 'develop' 2016-01-26 16:19:39 -07:00
tops Updated all the module index pages with the latest/newest modules 2015-03-02 13:59:19 -07:00
wheel/all Updated all the module index pages with the latest/newest modules 2015-03-02 13:59:19 -07:00
index.rst Merge branch '2015.8' into 'develop' 2016-01-26 16:19:39 -07:00
peer.rst Changed notes to indicate that functions are matched using regular expressions instead of minions 2016-01-12 11:55:36 -07:00
publisheracl.rst Deprecate client_acl with publisher_acl (rename) 2015-10-23 11:59:40 +03:00
python-api.rst Whitespace cleanup 2014-12-11 07:53:20 -08:00