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
..
documentation.rst	Change all relevant Boron references to 2016.3.0	2016-02-10 15:45:28 -07:00
formulas.rst	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
packaging.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-15 16:20:48 -07:00
release.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
style.rst	Merge pull request #31658 from rallytime/add-style-to-contrib	2016-03-03 15:14:57 -07:00