rallytime f6d9cdc633 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/ref/states/compiler_ordering.rst - doc/topics/installation/suse.rst - doc/topics/jobs/schedule.rst - doc/topics/targeting/grains.rst - doc/topics/tutorials/preseed_key.rst - doc/topics/tutorials/states_pt5.rst - pkg/suse/use-forking-daemon.patch - salt/minion.py - salt/modules/pacman.py - salt/modules/state.py - salt/modules/yumpkg.py		2016-03-25 11:47:16 -06:00
..
index.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
master.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
minion.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
yaml_idiosyncrasies.rst	Merge branch '2015.8' into 'develop'	2016-01-26 16:19:39 -07:00