Colton Myers ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/man/salt.7 doc/ref/auth/all/index.rst doc/ref/auth/all/salt.auth.rest.rst doc/ref/beacons/all/index.rst doc/ref/beacons/all/salt.beacons.ps.rst doc/ref/pillar/all/index.rst doc/ref/pillar/all/salt.pillar.consul_pillar.rst doc/ref/pillar/all/salt.pillar.neutron.rst doc/ref/pillar/all/salt.pillar.sql_base.rst doc/ref/pillar/all/salt.pillar.sqlite3.rst doc/ref/sdb/all/salt.sdb.rest.rst salt/modules/rh_ip.py salt/utils/http.py		2015-09-22 15:31:46 -06:00
..
all	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-22 15:31:46 -06:00