Erik Johnson 175ba127be Merge branch '2014.7' into 2014.7-2015.2 ... Conflicts: salt/modules/archive.py		2015-01-14 14:26:22 -06:00
..
auth/all	Whitespace cleanup	2014-12-11 07:53:20 -08: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	Comma cleanup	2014-12-12 11:34:34 -08: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	Whitespace cleanup	2014-12-11 07:53:20 -08:00
netapi/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
output/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
pillar	Whitespace cleanup	2014-12-11 07:53:19 -08:00
renderers	Comma cleanup	2014-12-12 11:37:59 -08:00
returners	Whitespace cleanup	2014-12-11 07:53:20 -08:00
roster/all	Whitespace cleanup	2014-12-11 07:53:20 -08:00
runners	Whitespace cleanup	2014-12-11 07:53:20 -08:00
states	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07: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	Whitespace cleanup	2014-12-11 07:53:20 -08: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