rallytime 838dc12b77 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/daemons.py - salt/config/__init__.py - salt/exceptions.py - salt/pillar/foreman.py - salt/returners/local_cache.py - salt/states/saltmod.py - salt/utils/__init__.py - salt/utils/cloud.py The merge conflicts in salt/cli/daemons.py are still present in this commit. @s0undt3ch is going to resolve them after this commit.		2016-03-08 10:14:32 -07: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-02 10:26:13 -07: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