Colton Myers 2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/topology/syndic.rst salt/client/__init__.py salt/daemons/masterapi.py salt/minion.py salt/modules/dockerio.py		2015-03-19 16:03:29 -06:00
..
proxyminion	Comma cleanup	2014-12-12 11:38:50 -08:00
index.rst	Merge conflict and rebase.	2014-02-26 13:32:08 -07:00
syndic.rst	Update syndic documentation	2015-03-18 16:05:07 -06:00