Commit Graph

14 Commits

Author SHA1 Message Date
Benjamin Drung
58d46a7e98 Fix typo certficate -> certificate 2016-02-04 12:34:50 +01:00
Colton Myers
0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py
2015-12-01 13:26:44 -07:00
C. R. Oldham
e9c13c561b Doc bug--salt.utils.http takes verify_ssl not ssl_verify. 2015-11-25 15:57:31 -07:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
2015-07-08 16:24:58 -06:00
rallytime
d0b61f3fc1 A couple of doc fixes for the http tutorial 2015-07-07 15:12:36 -06:00
Joseph Hall
3dea1e98a1 Add tornado to http.query, and make it the default 2015-04-30 14:07:51 -06:00
Joseph Hall
f5e8b4a10e Don't default CA bundle updates to a non-standard location 2015-01-28 20:09:13 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00
Joseph Hall
483e84c78a Update HTTP tutorial for new functionality 2015-01-21 09:20:11 -07:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
c18e834be1 Fix trailing whitespace
Conflicts:
	doc/topics/tutorials/states_pt2.rst
2014-12-11 07:53:19 -08:00
Joseph Hall
725f2d8969 Typo correction 2014-08-14 14:31:25 -06:00
Joseph Hall
130755c0b1 Adding http libraries and modules 2014-08-14 13:33:12 -06:00