valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,492 Commits 24 Branches 182 Tags 341 MiB
792b0ba9c6
Commit Graph

37492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
547d55b8e6 removing unused import 2015-01-02 08:06:28 -08:00
Christophe Vedel
9aeda9b754 Add ssl_match_hostname to deps in thin tarball 2015-01-02 16:44:41 +01:00
Gareth J. Greenaway
2c7c5d3f81 merge conflict 2015-01-01 20:13:27 -08:00
Lance Linder
5c39c880fa pydsl/pyobjects missing listen and listen_in 
This pull request is to resolve issue 19311
 2014-12-31 11:03:50 -06:00
Tim O'Guin
b9744c6fff merge 2014-12-31 09:12:41 -06:00
Tim O'Guin
59bcfe6b74 fix config format typo in Tomcat module docs 2014-12-31 09:10:18 -06:00
Erik Johnson
68efa5a7a8 Cleanup pip state when requirements file is used 
This cleans up the comments for the pip.installed state, removing an
extraneous comment and making a minor grammar fix.
 2014-12-30 13:44:06 -06:00
Thomas S Hatch
38d4fec056 Merge pull request #19295 from belvedere-trading/2014.7 
[32702] Patch salt to allow scheduling to work properly on Windows
 2014-12-30 12:30:27 -07:00
Ben Levine
019eaf0cb1 [32702] Patch salt to allow scheduling to work properly on Windows 
- See bug: https://github.com/saltstack/salt/issues/19277
- Fixes an issue where non-portable implementation prevented
  Windows hosts from using 'when' or 'cron' based schedules
 2014-12-30 11:00:09 -06:00
Thomas S Hatch
cd1239a2d7 Merge pull request #19238 from jfindlay/ensure_cmd 
update cmd state and module integration tests
 2014-12-28 13:28:17 -07:00
Thomas S Hatch
4f2ecf16b3 Merge pull request #19228 from rallytime/bp-19154 
Backport #19154 to 2014.7
 2014-12-28 13:08:53 -07:00
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