Commit Graph

37481 Commits

Author SHA1 Message Date
Thomas S Hatch
1671b7e926 Merge pull request #19226 from rallytime/bp-19121
Backport #19121 to 2014.7
2014-12-28 13:08:08 -07:00
Justin Findlay
00c97ad94b split _run cmd 2014-12-23 13:59:25 -07:00
Mike Place
1686cd1b5c update cmdmod state calls 2014-12-23 13:59:25 -07:00
Justin Findlay
4748156ed9 update cmdmod integration tests 2014-12-23 13:59:25 -07:00
C. R. Oldham
f8f1ee2506 Merge pull request #19182 from cro/eauth_in_django2
Add ability for Salt to authenticate against Django's ORM.  Git selfie
2014-12-23 11:52:53 -07:00
Ryan Lane
e4460d0b42 Fix for boto_secgroup state to properly support lists for cidrs, group ids and group names 2014-12-23 11:37:00 -07:00
Nitin Madhok
9f601484bf Fixing unit tests for mdadm 2014-12-23 11:31:58 -07:00
Nitin Madhok
d744fc6311 Fixing salt.modules.mdadm.create broken functionality 2014-12-23 11:31:58 -07:00
Nicole Thomas
4c8ee80d49 Merge pull request #19222 from rallytime/linting
Add missing import
2014-12-23 10:24:15 -07:00
C. R. Oldham
2e00a81320 Pylint fix for the pylint fix 2014-12-23 10:23:18 -07:00
rallytime
03073041a9 Add missing import 2014-12-23 10:11:14 -07:00
Thomas S Hatch
6a942532dd Merge pull request #19207 from whiteinge/doc-key-urls-version
Added missing versionadded directives for the /key URLs
2014-12-22 18:00:00 -07:00
Thomas S Hatch
8c8c5473eb Merge pull request #19202 from basepi/salt-ssh.tty.scp
Fix for salt-ssh with tty enabled
2014-12-22 17:55:01 -07:00
C. R. Oldham
31f5c7ab79 Pylint fix 2014-12-22 17:08:11 -07:00
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
Seth House
f3d936fb2f Added missing versionadded directives for the /key URLs
Doh. My bad.
2014-12-22 16:33:26 -07:00
Colton Myers
f2fd892dc5 Merge pull request #19145 from whiteinge/sphinx-fixups
Minor Sphinx fixups
2014-12-22 16:25:01 -07:00
Colton Myers
586b834154 Use faster random filename generation 2014-12-22 15:41:12 -07:00
Colton Myers
9700f4add9 Use NamedTemporaryFile 2014-12-22 15:17:38 -07:00
Colton Myers
5ad67a1229 Fix typo (cachedir, not cache_dir) 2014-12-22 15:04:39 -07:00
Colton Myers
67cff17039 Copy the shim to the target system to execute if tty is enabled 2014-12-22 14:38:01 -07:00
C. R. Oldham
8c9587e10c More pylint 2014-12-22 11:46:01 -07:00
C. R. Oldham
9f696a2e1b Handle initial django setup differently and fix pylint 2014-12-22 11:24:55 -07:00
C. R. Oldham
557d31334f Add ability to retrieve authentication from the Django ORM. 2014-12-22 11:24:36 -07:00
C. R. Oldham
0cf56eaff4 More additions to django eauth 2014-12-22 11:24:27 -07:00
C. R. Oldham
98965d6dd9 First cut at eauth via django 2014-12-22 11:24:16 -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