Thomas S Hatch
|
e595b3b8f4
|
Merge pull request #19368 from rallytime/python_shell
Changes and additions of python shell kwargs
|
2015-01-06 14:17:27 -07:00 |
|
Thomas S Hatch
|
d88cb37538
|
Merge pull request #19408 from thedrow/patch-2
Rbenv documentation fix
|
2015-01-06 14:08:56 -07:00 |
|
Omer Katz
|
27a84c5e7e
|
Removed a duplicate dependecy and added libffi which is needed according to https://github.com/sstephenson/ruby-build/wiki#build-failure-of-fiddle-with-ruby-220
|
2015-01-06 22:50:55 +02:00 |
|
Mike Place
|
520b709f8e
|
Merge pull request #19407 from cachedout/more_arch
Tweak arch db upgrade
|
2015-01-06 13:47:21 -07:00 |
|
Mike Place
|
acca71a681
|
Tweak arch db upgrade
|
2015-01-06 13:46:45 -07:00 |
|
Mike Place
|
d2d1085f93
|
Merge pull request #19406 from cachedout/batch_fix
Default transport in ckminions
|
2015-01-06 13:40:27 -07:00 |
|
Mike Place
|
aa12ac9083
|
Default transport in ckminions
|
2015-01-06 13:39:57 -07:00 |
|
Mike Place
|
b5e948e396
|
Merge pull request #19403 from cachedout/backport_bootstrap
Backport arch and centos fixes into deploy bootstrap
|
2015-01-06 13:22:29 -07:00 |
|
Mike Place
|
b49e7b120d
|
Backport arch and centos fixes into deploy bootstrap
|
2015-01-06 13:21:53 -07:00 |
|
Thomas S Hatch
|
48a5597847
|
Merge pull request #19323 from jacksontj/aes_cleanup
Make AES key never hit disk on the master
|
2015-01-06 11:53:56 -07:00 |
|
Mike Place
|
170ce2a6f3
|
Merge pull request #19396 from cachedout/remove_unused_import_in_cp
These were unused and causing weird recursion errors in unit tests
|
2015-01-06 11:04:25 -07:00 |
|
Mike Place
|
c706ed279c
|
These were unused and causing weird recursion errors in unit tests
|
2015-01-06 11:03:21 -07:00 |
|
Thomas S Hatch
|
00e9686488
|
Merge pull request #19303 from cachedout/batch_ckminions
Batch ckminions
|
2015-01-06 10:37:42 -07:00 |
|
Thomas S Hatch
|
8915ee4260
|
Merge pull request #19388 from lorengordon/develop
Update vcredist version, fixes saltstack/salt#19387
|
2015-01-06 10:25:05 -07:00 |
|
Thomas S Hatch
|
1a04c83a3d
|
Merge pull request #19385 from ajacoutot/develop
openbsdrcctl: fix code to match new rcctl(8) syntax.
|
2015-01-06 10:24:44 -07:00 |
|
Thomas S Hatch
|
04733d3535
|
Merge pull request #19372 from hulu/log-setup-naming
rename log setup funcs for PEP8 compliance
|
2015-01-06 10:23:43 -07:00 |
|
Thomas S Hatch
|
6218e98a18
|
Merge pull request #19371 from hulu/auth-django
minor cleanup of Django auth
|
2015-01-06 10:23:28 -07:00 |
|
Thomas S Hatch
|
a7a5362798
|
Merge pull request #19370 from Seveland12/develop
fixed typo in tests/consist.py
|
2015-01-06 10:22:55 -07:00 |
|
Thomas S Hatch
|
4ce4a63c00
|
Merge pull request #19366 from cachedout/issue_18598
Fix typo in jboss7 module.
|
2015-01-06 10:21:45 -07:00 |
|
Thomas S Hatch
|
13c0885277
|
Merge pull request #19344 from RobertFach/svn-export-fix-issue-19343
Svn export fix issue 19343
|
2015-01-06 10:15:27 -07:00 |
|
Thomas S Hatch
|
40aec9da44
|
Merge pull request #19390 from thatch45/jayeshka-apache_unit_test
Merge #19342
|
2015-01-06 10:14:49 -07:00 |
|
Antoine Jacoutot
|
7b99eeb6ab
|
openbsdrcctl: turn badvar into a tuple and fix lint warnings
|
2015-01-06 18:14:23 +01:00 |
|
Thomas S Hatch
|
b01ac59df6
|
fix bad lint error
|
2015-01-06 10:13:47 -07:00 |
|
Thomas S Hatch
|
ab0b432d94
|
Merge branch 'apache_unit_test' of https://github.com/jayeshka/salt into jayeshka-apache_unit_test
|
2015-01-06 10:11:50 -07:00 |
|
Loren Gordon
|
a1d7868d64
|
Update vcredist version, fixes saltstack/salt#19387
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
|
2015-01-06 12:02:36 -05:00 |
|
Antoine Jacoutot
|
113c56a8da
|
openbsdrcctl: fix code to match new rcctl(8) syntax.
|
2015-01-06 16:23:11 +01:00 |
|
robert.fach
|
d6389c8e1c
|
fixed identation problem
|
2015-01-06 09:42:17 +01:00 |
|
Joseph Hall
|
adbcb96c09
|
Merge pull request #19315 from Melrok/fix-salt-cloud-volumes
Fix salt cloud volumes
|
2015-01-05 21:02:18 -07:00 |
|
Chris Rebert
|
5304e272c2
|
rename log setup funcs for PEP8 compliance
|
2015-01-05 17:59:45 -08:00 |
|
Chris Rebert
|
12b4260709
|
minor cleanup of Django auth
|
2015-01-05 17:56:16 -08:00 |
|
Thomas Jackson
|
687012b6c5
|
Pop "aes" from the opts before passing to ext_pillar modules
We should probably not put "aes" in the global opts dict, but rather as a class attribute of auth/crypticle or something
|
2015-01-05 17:23:24 -08:00 |
|
Thomas Jackson
|
d226ebbf43
|
Pylint cleanup
|
2015-01-05 17:23:19 -08:00 |
|
sjwehry
|
8eb6de4e09
|
fixed typo in tests/consist.py
fixed typo in tests/consist.py
|
2015-01-05 20:01:16 -05:00 |
|
root
|
9993366d70
|
Changed from using type() to isinstance() per pull request comment
|
2015-01-06 00:11:26 +00:00 |
|
rallytime
|
d8667fbd74
|
freebsd_sysctl module python shell kwarg additons
|
2015-01-05 16:53:28 -07:00 |
|
rallytime
|
73a2525f5b
|
freebsdservice module python shell kwarg additions
|
2015-01-05 16:51:50 -07:00 |
|
rallytime
|
a0501ecdeb
|
extfs module python shell kwarg additions
|
2015-01-05 16:46:56 -07:00 |
|
rallytime
|
d84e0412aa
|
dpkg module python shell kwarg additions
|
2015-01-05 16:41:13 -07:00 |
|
rallytime
|
842d345ad8
|
django module python_shell=False additions
|
2015-01-05 16:36:12 -07:00 |
|
rallytime
|
c08939a755
|
disk module python_shell=False addition
|
2015-01-05 16:34:20 -07:00 |
|
rallytime
|
4034e66acb
|
debconfmod module python_shell=False addition
|
2015-01-05 16:29:03 -07:00 |
|
rallytime
|
603ba43bcd
|
daemontools module python_shell=False additions
|
2015-01-05 16:26:14 -07:00 |
|
rallytime
|
515252b2b9
|
composer module python_shell=False additon
|
2015-01-05 16:22:58 -07:00 |
|
Mike Place
|
ef567a9309
|
Fix typo in jboss7 module.
Closes #18598
|
2015-01-05 15:57:09 -07:00 |
|
rallytime
|
199f4e04f2
|
brew module python_shell=False addition
|
2015-01-05 15:56:07 -07:00 |
|
rallytime
|
ba82cce8a2
|
blockdev module python_shell=False addition
|
2015-01-05 15:53:58 -07:00 |
|
Pedro Algarvio
|
927290ff44
|
Merge pull request #19359 from rallytime/pylint_fix
Pylint fix for develop
|
2015-01-05 22:20:13 +00:00 |
|
rallytime
|
6d26bd4c0c
|
Pylint fix for develop
|
2015-01-05 14:42:03 -07:00 |
|
Thomas S Hatch
|
5fcb74226b
|
Merge pull request #19351 from jfindlay/win_firewall
win_firewall: fix disable, enable and add delete_rule
|
2015-01-05 13:28:44 -07:00 |
|
Thomas S Hatch
|
9cc1af7ebc
|
Merge pull request #19347 from mens/patch-1
Update states/augeas.py. Fix index error.
|
2015-01-05 13:27:45 -07:00 |
|