rallytime 7554d0f42d Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/ref/states/include.rst - doc/topics/cloud/reactor.rst - doc/topics/reactor/index.rst - doc/topics/releases/2015.5.10.rst - doc/topics/tutorials/states_pt5.rst - doc/topics/windows/windows-package-manager.rst - salt/config.py - salt/modules/state.py - salt/states/grains.py - tests/integration/modules/sysmod.py - tests/unit/states/grains_test.py		2016-03-24 15:48:00 -06:00
..
all	Allow parent relative includes in state files	2015-07-21 16:32:38 +10: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