Colton Myers a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/topics/releases/version_numbers.rst salt/cli/batch.py salt/minion.py salt/state.py setup.py		2015-06-18 11:43:11 -06:00
..
auth/all	Removed stormpath_mod and linodepy docs; these were renamed	2015-05-01 14:24:00 -06:00
beacons/all	Added autodoc generated pages for the new modules types	2015-04-03 12:45:49 -06:00
cli	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-10 12:01:43 -06:00
clients	Add salt.loader.grain_funcs	2015-05-05 20:12:06 -07:00
clouds/all	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
configuration	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-18 11:43:11 -06:00
engines/all	Adding salt.engines.sqs_events.rst to doc	2015-04-13 12:20:42 -04:00
file_server	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06:00
internals	Do not reference serializers from aggregation docs.	2015-05-28 20:04:20 -04:00
modules	2015.5.2 release changes	2015-06-11 10:01:30 -06:00
netapi/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
output/all	Added autosummary generated placeholders for the new module docs	2015-03-02 14:07:18 -07:00
pillar	Salt cloud doc updates, build errors and bug fixes	2015-06-04 16:42:47 -06:00
renderers	Added autosummary generated placeholders for the new module docs	2015-03-02 14:07:18 -07:00
returners	add missing module documentation to references	2015-06-04 21:17:24 +02:00
roster/all	Add missing RST file	2015-05-06 12:06:49 -05:00
runners	add missing module documentation to references	2015-06-04 21:17:24 +02:00
sdb/all	Added autodoc generated pages for the new modules types	2015-04-03 12:45:49 -06:00
serializers/all	Add new module type for serializers from issue #22257.	2015-05-28 20:03:11 -04:00
states	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-18 11:43:11 -06: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
clientacl.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-03-30 15:10:17 -06:00
peer.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
python-api.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00