Commit Graph

35396 Commits

Author SHA1 Message Date
Thomas S Hatch
f66d706154 Merge pull request #15896 from terminalmage/fix-sphinx
Fix sphinx build errors
2014-09-18 00:34:28 -06:00
Thomas S Hatch
599157bcd6 Merge pull request #15890 from rallytime/aptpkg_purge_docs
Remove incorrect documentation in aptpkg.purge
2014-09-18 00:33:39 -06:00
Joseph Hall
c1dfc613f9 Merge pull request #15901 from UtahDave/2014.7local
Fix missing dict key from ec2 response.
2014-09-17 21:22:21 -06:00
David Boucha
11ef2fdbbf fix more instances of missing name key 2014-09-17 20:24:01 -06:00
David Boucha
fddd78188f add vm name to traverse down the dictionary 2014-09-17 20:18:31 -06:00
Erik Johnson
70a6deca28 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
48a41d6371 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
474acf7224 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
2339984e48 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f776c19a77 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f38c312164 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
e32893b748 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
537c681f62 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
37b4088cf5 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
88fc98fa8a Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
1ea6279bd7 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
061424239b Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f391456dd5 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
b338a31691 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
778574c9d5 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
36d59944d1 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
c094f8bd68 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
604a131f6f Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
05fdb3c8fd Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
fbce823db7 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f47dd063e3 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
f056c9c3fa Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
132bdb78ee Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
70f10cb13e Fix sphinx build error 2014-09-17 18:00:18 -05:00
Erik Johnson
13cc497b36 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Thomas S Hatch
72a655e67e Merge pull request #15882 from thatch45/if_fix_ssh
restore missing dict check
2014-09-17 16:44:16 -06:00
Thomas S Hatch
8dfce44727 Merge pull request #15883 from thatch45/dunder_kwargs
revert #15550
2014-09-17 16:43:17 -06:00
Mike Place
e40709b7c8 Merge pull request #15893 from rallytime/ec2_config_docs
Clarify region settings in ec2 config docs
2014-09-17 16:22:04 -06:00
rallytime
9a4f9e6fae Clarify region settings in ec2 config docs 2014-09-17 16:16:35 -06:00
rallytime
2e4497bc5a Remove incorrect documentation in aptpkg.purge
Fixes #15529
2014-09-17 15:09:51 -06:00
Mike Place
2b4ff38897 Merge pull request #15888 from rallytime/service_mod_docs
Update service.reload docs
2014-09-17 15:04:00 -06:00
Samuel Smith
2808c45ad6 Merge pull request #15889 from SmithSamuelM/2014.7_sam4
Explicitly set raet role  Added opts for raet_main and raet_mutable
2014-09-17 14:58:59 -06:00
Samuel M Smith
7bae31c978 Remoted wingdbstub comment 2014-09-17 14:56:32 -06:00
rallytime
7ed8be8e89 Update service.reload docs 2014-09-17 14:53:43 -06:00
Thomas S Hatch
12ef4c7d2e Merge pull request #15881 from thatch45/master_id
Give the master a unique id
2014-09-17 14:53:31 -06:00
Samuel M Smith
bff17d1dc0 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-17 14:52:51 -06:00
Samuel M Smith
ce54e579e0 Explicitly set raet role 2014-09-17 14:50:02 -06:00
Thomas S Hatch
b2e9484945 Merge pull request #15722 from cachedout/issue_15415
Ping on AES rotate
2014-09-17 14:40:21 -06:00
Mike Place
50579b31cd Set default to false 2014-09-17 14:38:42 -06:00
Thomas S Hatch
0906525f27 revert #15550 2014-09-17 14:29:57 -06:00
Thomas S Hatch
ec4d0b1137 restore missing dict check 2014-09-17 14:27:12 -06:00
Thomas S Hatch
8a62de59c7 give the master a unique id 2014-09-17 13:56:55 -06:00
Thomas S Hatch
d35e38907f Merge branch 'SmithSamuelM-2014.7_sam3' into 2014.7 2014-09-17 13:49:48 -06:00
Thomas S Hatch
9b54e5b55a lint fixes 2014-09-17 13:49:29 -06:00
Thomas S Hatch
1cb62b7e76 Merge branch '2014.7_sam3' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam3 2014-09-17 13:47:01 -06:00