Colton Myers cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/ref/configuration/master.rst doc/topics/cloud/linode.rst salt/cloud/clouds/linode.py salt/modules/rh_ip.py salt/renderers/pyobjects.py salt/states/file.py		2016-01-21 17:42:50 -07:00
..
all	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-21 17:42:50 -07:00
index.rst	Merge branch '2015.8' into develop	2015-11-04 15:40:03 -07:00