Commit Graph

37354 Commits

Author SHA1 Message Date
Thomas S Hatch
334f1f89f0 Merge pull request #19150 from rallytime/bp-19134
Backport #19134 to 2014.7
2014-12-22 16:35:06 -07:00
Thomas S Hatch
5e2473cf43 Merge pull request #19144 from rallytime/bp-19116
Backport #19116 to 2014.7
2014-12-22 16:34:07 -07:00
Colton Myers
f2fd892dc5 Merge pull request #19145 from whiteinge/sphinx-fixups
Minor Sphinx fixups
2014-12-22 16:25:01 -07:00
Thomas S Hatch
daf782d2a9 Merge pull request #19153 from rallytime/windows_pkg_docs
Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1
2014-12-22 09:24:10 -07:00
Thomas S Hatch
052f90e47c Merge pull request #19143 from rallytime/bp-19079
Backport #19079 to 2014.7
2014-12-22 09:19:53 -07:00
Thomas S Hatch
f0924b6ce5 Merge pull request #19139 from rallytime/bp-19051
Backport #19051 to 2014.7
2014-12-22 09:19:14 -07:00
Joseph Hall
d0e2986d12 Merge pull request #19158 from eliasp/2014.7-modules.win_system-doc
Syntax/formatting.
2014-12-20 12:57:18 -07:00
Elias Probst
a276dc1fed Syntax/formatting. 2014-12-20 16:55:05 +01:00
Pedro Algarvio
566d47714f Merge pull request #19155 from techhat/issue15959
Allow service_name to be specified for azure
2014-12-20 14:53:49 +00:00
Joseph Hall
d8fc47b4d6 Allow service_name to be specified for azure 2014-12-19 21:38:44 -07:00
Thomas S Hatch
61c59d8c1c Merge pull request #19135 from rallytime/bp-18915
Backport #18915 to 2014.7
2014-12-19 16:36:36 -07:00
Ryan Lane
63d0184c9c Fix issue in boto_secgroup state that caused rules to not be properly updated 2014-12-19 16:19:54 -07:00
rallytime
b43519b882 Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1
Fixes #19146
2014-12-19 16:00:30 -07:00
Seth House
a8e8111c92 Add a cross-ref to the vmbuilder formula repo 2014-12-19 14:34:58 -07:00
Seth House
d2e9378084 Switch html_title to empty string instead of None 2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f Switch the :formula: extlink to :formula_url:
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
2014-12-19 14:34:57 -07:00
Seth House
f345188d06 Set minimum Sphinx version to 1.3 2014-12-19 14:34:57 -07:00
Nitin Madhok
a833d89b2c Redoing some changes 2014-12-19 14:14:46 -07:00
Nitin Madhok
588ffdace6 Correctly convert command list into string and do not error if conf file missing. Fixes #19117 2014-12-19 14:14:46 -07:00
Nitin Madhok
09b11bf8e4 Access dictionary values correctly in salt.modules.mdadm.destroy Fixes #19115 2014-12-19 14:14:46 -07:00
Lendar
8a885fc38f Fix PUT/DELETE in s3.query
Was broken in 8ed7c92 during move to requests.

- PUT now uploads data
- Fixes AttributeError
2014-12-19 14:07:16 -07:00
Thomas S Hatch
2fadac5706 Merge pull request #19104 from whiteinge/salt-fix-highstate-output-jobs-runner
Used unused variable; fix highstate output for jobs runner
2014-12-19 14:02:00 -07:00
Nitin Madhok
16692ad446 Refactor mdadm tests 2014-12-19 13:55:07 -07:00
Nitin Madhok
f1d573c9d8 Forgot to end with quotes 2014-12-19 13:55:06 -07:00
Nitin Madhok
210d1d221f Fixing unit tests for mdadm 2014-12-19 13:55:06 -07:00
Nitin Madhok
74b9bf69dd Fixing salt.modules.mdadm.create and correcting incorrect code. Fixes #18991 2014-12-19 13:55:06 -07:00
Wolodja Wentland
c2715dc38e Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri
This fixes #18909
2014-12-19 13:34:56 -07:00
Mike Place
91edd75a03 Merge pull request #19106 from jfindlay/split_win
Split windows commands
2014-12-19 13:11:20 -07:00
Mike Place
74cbd8f84f Merge pull request #19113 from garethgreenaway/19003_2014_7_bind_mounts
Fixes for when using bind mounts.
2014-12-19 11:55:48 -07:00
Mike Place
e919e187e8 Merge pull request #19111 from jfindlay/split_choc
Split chocolatey commands
2014-12-19 10:01:08 -07:00
Gareth J. Greenaway
ec9061983e Fixes for when using bind mounts. 2014-12-18 17:13:20 -08:00
Justin Findlay
44de89b43e chocolatey pylint fix 2014-12-18 16:14:02 -07:00
Justin Findlay
798eae73fb split chocolatey commands 2014-12-18 16:14:02 -07:00
Justin Findlay
e72cd5ae35 lint fix for win_service module 2014-12-18 14:47:01 -07:00
Justin Findlay
effb6a3b58 lint fix for win_ntp module 2014-12-18 14:46:56 -07:00
Seth House
d5ed3f30bd Used unused variable; fix highstate output for jobs runner
Closes #19099
2014-12-18 14:40:47 -07:00
Colton Myers
b62f78d32f Merge pull request #19107 from basepi/2014.7.1.release
Add more release notes for 2014.7.1
2014-12-18 14:20:23 -07:00
Colton Myers
9d5e05a381 Add more release notes for 2014.7.1 2014-12-18 14:19:52 -07:00
Justin Findlay
7361d1e527 chcp is a cmd builtin 2014-12-18 14:12:20 -07:00
Justin Findlay
093c526323 split win_useradd commands 2014-12-18 14:12:20 -07:00
Justin Findlay
e95078fcde split win_timezone commands 2014-12-18 14:12:20 -07:00
Justin Findlay
fe2ebd4c9c split win_system commands 2014-12-18 14:12:20 -07:00
Justin Findlay
866f94f813 split win_shadow commands 2014-12-18 14:12:20 -07:00
Justin Findlay
09d1f953b2 split win_service commands 2014-12-18 14:12:20 -07:00
Justin Findlay
ce5fc58f36 split win_pkg commands 2014-12-18 14:12:20 -07:00
Justin Findlay
d54063707e split win_ntp commands 2014-12-18 14:12:20 -07:00
Justin Findlay
d4782170bc split win_network commands 2014-12-18 14:12:20 -07:00
Justin Findlay
4c9fe766c2 add missing string variable in win_ip mod 2014-12-18 14:12:20 -07:00
Justin Findlay
53309e4618 split win_ip commands 2014-12-18 14:12:20 -07:00
Justin Findlay
6ceb41c2fc split win_groupadd commands 2014-12-18 14:12:20 -07:00