rallytime 9898fcf613 Merge branch '2015.2' into 'develop' ... Conflicts: .gitignore .pylintrc .testing.pylintrc salt/client/mixins.py salt/cloud/clouds/msazure.py salt/config.py salt/modules/mount.py salt/runners/doc.py salt/utils/event.py salt/utils/reactor.py		2015-01-29 17:24:04 -07:00
..
auth/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
beacons/all	Added beacon module docs to the module index	2015-01-26 18:19:34 -07:00
cli	Merge branch '2014.7' into 2014.7-2015.2	2015-01-14 14:26:22 -06:00
clients	Update netapi reference	2014-12-11 18:14:47 -06:00
clouds/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
configuration	Merge branch '2014.7' into merge_forward_fifteen_second_try	2015-01-29 13:42:49 -07:00
file_server	Comma cleanup	2014-12-12 11:39:07 -08:00
internals	Whitespace cleanup	2014-12-11 07:53:20 -08:00
modules	adding modules to doc salt.modules reference	2015-01-24 22:30:52 +01:00
netapi/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
output/all	adding output to doc salt.output reference	2015-01-24 22:38:28 +01:00
pillar	those files seem to be required, too	2015-01-24 21:51:45 +01:00
renderers	adding renderers to doc salt.renderers reference	2015-01-24 22:41:54 +01:00
returners	adding returners to doc salt.returners reference	2015-01-24 22:44:03 +01:00
roster/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
runners	adding runners to doc salt.runners reference	2015-01-24 22:46:06 +01:00
states	adding states to doc salt.states reference	2015-01-24 22:35:23 +01:00
tops	Whitespace cleanup	2014-12-11 07:53:20 -08:00
wheel/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
clientacl.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Added beacon module docs to the module index	2015-01-26 18:19:34 -07: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