Colton Myers f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/topics/event/index.rst salt/loader.py salt/modules/config.py salt/modules/cyg.py salt/modules/hg.py salt/modules/lxc.py salt/modules/upstart.py salt/states/hg.py salt/utils/cloud.py salt/utils/dictupdate.py salt/utils/schedule.py tests/integration/fileserver/gitfs_test.py tests/unit/pydsl_test.py		2015-02-18 11:55:29 -07:00
..
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
master.rst	Some fixes to #19161	2015-01-07 20:58:40 +00:00
minion.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
yaml_idiosyncrasies.rst	Tweak section header	2015-02-10 15:06:43 -06:00