Joseph Hall
|
6c346965e6
|
Merge pull request #6389 from hulu/fix-win_autoruns
fix pylint problems in modules.win_autoruns
|
2013-07-27 17:52:52 -07:00 |
|
Chris Rebert
|
9c0beaa0ff
|
fix pylint problems in modules.win_autoruns
|
2013-07-27 17:50:35 -07:00 |
|
Joseph Hall
|
28b05f117a
|
Merge pull request #6388 from iquaba/develop
Windows Autorun Enumerator
|
2013-07-27 17:42:20 -07:00 |
|
iquaba
|
1d0e75f29c
|
Adds windows autoruns enumerator
|
2013-07-27 19:37:40 -05:00 |
|
Thomas S Hatch
|
ef1ad71441
|
Merge pull request #6387 from hulu/file-avoid-stats-shadowing
file mod: avoid shadowing stats() function
|
2013-07-27 17:23:54 -07:00 |
|
Thomas S Hatch
|
3754a2f720
|
Merge pull request #6386 from hulu/_osx_gpudata-unused-arg
rm unused arg osdata from _osx_gpudata
|
2013-07-27 17:23:35 -07:00 |
|
Thomas S Hatch
|
08dbd2a741
|
Merge pull request #6385 from KB1JWQ/fixlogwarn
Add break statement to avoid obvious warning; linux tools don't live on OS X
|
2013-07-27 17:23:16 -07:00 |
|
Chris Rebert
|
45efb0a1a1
|
file mod: avoid shadowing stats() function
|
2013-07-27 17:18:37 -07:00 |
|
Chris Rebert
|
051b618aeb
|
rm unused arg osdata from _osx_gpudata
|
2013-07-27 17:14:33 -07:00 |
|
Corey Quinn
|
c5b171689b
|
Add break statement to avoid obvious warning
|
2013-07-27 17:10:15 -07:00 |
|
Joseph Hall
|
598c17ecb3
|
Merge pull request #6383 from hulu/fix-apache-indents
modules.apache: 2-space indents => 4-space indents
|
2013-07-27 17:00:57 -07:00 |
|
Chris Rebert
|
abf296e388
|
modules.apache: 2-space indents => 4-space indents
|
2013-07-27 16:59:34 -07:00 |
|
Thomas S Hatch
|
4720b5bc47
|
Merge pull request #6382 from hulu/fix-file-restore_backup
file.restore_backup: FileNotFoundError is from Python 3; rm pointless 'pass'
|
2013-07-27 16:56:02 -07:00 |
|
Chris Rebert
|
bcad68b08b
|
FileNotFoundError is from Python 3; rm pointless 'pass'
|
2013-07-27 16:53:11 -07:00 |
|
Thomas S Hatch
|
7cd8b429b0
|
Merge pull request #6381 from hulu/minion-indents
fix indents in minion.py
|
2013-07-27 16:51:44 -07:00 |
|
Thomas S Hatch
|
f5a77bdc9b
|
Merge pull request #6380 from KB1JWQ/osxfixversion
OS X now has an osrelease grain
|
2013-07-27 16:51:13 -07:00 |
|
Chris Rebert
|
0a1e601bbd
|
fix indents in minion.py
|
2013-07-27 16:49:33 -07:00 |
|
Corey Quinn
|
5f9df22287
|
OS X now has an os version
|
2013-07-27 16:49:05 -07:00 |
|
Corey Quinn
|
e3a4c88aa7
|
Merge branch 'develop' of github.com:saltstack/salt into osxfixversion
|
2013-07-27 16:47:20 -07:00 |
|
Thomas S Hatch
|
82a5f858a2
|
Check for type errors on valid config arguments
|
2013-07-27 17:46:04 -06:00 |
|
Thomas S Hatch
|
1040387b8a
|
Merge pull request #6379 from doublerr/apacheTasks
fix spacing, switch to cmd.retcode
|
2013-07-27 16:40:05 -07:00 |
|
Corey Quinn
|
8d95fd421c
|
Add osversion to OS X
|
2013-07-27 16:39:16 -07:00 |
|
Thomas S Hatch
|
78064fa14a
|
Merge pull request #6378 from naiyt/develop
Populate __context__ with retcode; Fixes issue #5518
|
2013-07-27 16:39:05 -07:00 |
|
Ryan Richard
|
ac8eba0d9b
|
fix spacing, switch to cmd.retcode
|
2013-07-27 23:30:31 +00:00 |
|
Joseph Hall
|
ed29fa103a
|
Merge pull request #6376 from terminalmage/issue6322
Add functions to manage file backups
|
2013-07-27 16:27:13 -07:00 |
|
Joseph Hall
|
83e52c8f43
|
Merge pull request #6375 from doublerr/apacheTasks
add support for a2ensite,a2dissite
|
2013-07-27 16:24:42 -07:00 |
|
Thomas S Hatch
|
08345d6767
|
Merge pull request #6377 from KB1JWQ/osxfixgpu
Detection and enumeration of GPUs works on a Mac now
|
2013-07-27 16:23:29 -07:00 |
|
Nate Collings
|
3df96226d4
|
Populate __context__ with retcode; Fixes issue #5518
|
2013-07-27 17:22:10 -06:00 |
|
Erik Johnson
|
3a2fbbf7dc
|
add information to backup restoration docs
|
2013-07-27 18:20:06 -05:00 |
|
Ryan Richard
|
c16677d296
|
switch command to __salt__['cmd.run']
|
2013-07-27 23:18:26 +00:00 |
|
Corey Quinn
|
2fd6b8de04
|
Detection and enumeration of GPUs works on a Mac now
|
2013-07-27 16:14:31 -07:00 |
|
Ryan Richard
|
d65cec4ec4
|
make Mike happy
|
2013-07-27 23:13:04 +00:00 |
|
Erik Johnson
|
a77a7bd5f1
|
Document backup listing/restoring/deleting
|
2013-07-27 18:09:41 -05:00 |
|
Ryan Richard
|
de28f6b970
|
add support for a2ensite,a2dissite
|
2013-07-27 23:04:56 +00:00 |
|
Erik Johnson
|
c2b2f675c0
|
Add file.restore_backup, file.delete_backup
These functions allow you to restore a backup found with
file.list_backups, as well as remove unwanted backups.
|
2013-07-27 17:49:55 -05:00 |
|
Thomas S Hatch
|
2fa7df3829
|
Merge pull request #6360 from kula/fix_5813
POTENTIAL FIX: Backoff when minion fails to connect
|
2013-07-27 15:47:54 -07:00 |
|
Joseph Hall
|
bba9f30604
|
Merge pull request #6373 from KB1JWQ/fixosvirt
Much better OS X virt detection now. It actually matches!
|
2013-07-27 15:44:34 -07:00 |
|
Joseph Hall
|
9b1a050115
|
Merge pull request #6374 from michaelrice/develop
fix spelling error
|
2013-07-27 15:44:04 -07:00 |
|
Michael Rice
|
ba15349569
|
fix spelling error
|
2013-07-27 22:38:24 +00:00 |
|
Corey Quinn
|
e6b7de032d
|
Remove accidentally added file
|
2013-07-27 15:34:57 -07:00 |
|
Corey Quinn
|
49aed903db
|
Better detection still for OS X
|
2013-07-27 15:29:44 -07:00 |
|
Joseph Hall
|
784f173bfb
|
Merge pull request #6372 from KB1JWQ/corey-fixmem
Memory detection actually works on OS X now
|
2013-07-27 15:17:25 -07:00 |
|
Corey Quinn
|
0d24f0ed92
|
Memory detection actually works on OS X now
|
2013-07-27 15:15:28 -07:00 |
|
Joseph Hall
|
8ceaa377ff
|
Merge pull request #6371 from KB1JWQ/corey-fixosxvirt
Make virtualization detection on OS X less buggy/horrible
|
2013-07-27 15:09:21 -07:00 |
|
Corey Quinn
|
0d04b09f34
|
Make virtualization detection on OS X less buggy/horrible
|
2013-07-27 15:07:08 -07:00 |
|
Joseph Hall
|
69475d0b8e
|
Merge pull request #6369 from hulu/mysql-processlist-connection_args
use connection_args in modules.mysql.processlist()
|
2013-07-27 15:01:31 -07:00 |
|
Joseph Hall
|
58f8d44444
|
Merge pull request #6368 from l2ol33rt/useradd_fix_linux
Honor createhome: False when adding a user
|
2013-07-27 15:01:08 -07:00 |
|
Chris Rebert
|
f65ca062f2
|
use connection_args in modules.mysql.processlist()
|
2013-07-27 15:00:23 -07:00 |
|
Colton Myers
|
b5582d2289
|
Merge pull request #6362 from KB1JWQ/Corey-fixcpuflags
Fix cpu_flags on MacOS
|
2013-07-27 14:58:23 -07:00 |
|
Joseph Hall
|
525d52c849
|
Merge pull request #6367 from JasonSwindle/patch-1
Updating Grains doc to show JINJA in Top file matching with grains. #6335
|
2013-07-27 14:53:49 -07:00 |
|