Corey Quinn
8d95fd421c
Add osversion to OS X
2013-07-27 16:39:16 -07: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
Joseph Hall
157d86a37b
Merge pull request #6366 from hulu/utils-not-util
...
fix typos of salt.utils in modules.win_disk
2013-07-27 14:53:23 -07:00
Jason Swindle
4c5da1347e
Updating Grains doc to show JINJA in Top file matching with grains.
2013-07-27 16:51:07 -05:00
Chris Rebert
1e89594681
fix typos of salt.utils in modules.win_disk
2013-07-27 14:48:58 -07:00
Joseph Hall
6a8a5a16a1
Merge pull request #6363 from saurabhsurana/rabbitmq-module-add-commands
...
Rabbitmq module add commands
2013-07-27 14:45:56 -07:00
Joseph Hall
49b0076872
Merge pull request #6365 from hulu/die-tabs-die
...
convert tabs introduced in #6356 to spaces
2013-07-27 14:45:08 -07:00
Chris Rebert
0822774cf3
convert tabs introduced in #6356 to spaces
2013-07-27 14:42:38 -07:00
Saurabh Surana
7959c651b2
correct example in comment
2013-07-27 14:27:20 -07:00
Saurabh Surana
2858723e80
added application management commands to rabbitmq module
2013-07-27 14:24:30 -07:00
Robert James Hernandez
65ba21e9af
Honor createhome: False when adding a user
2013-07-27 14:21:36 -07:00
Corey Quinn
e72876ba91
Fix cpu_flags on MacOS
2013-07-27 14:13:15 -07:00
Thomas L. Kula
54a0746b4e
Backoff when minion fails to connect
...
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.
This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.
POTENTIAL FIX: Issue #5813
2013-07-27 16:51:38 -04:00
Thomas S Hatch
949937c005
Merge pull request #6359 from hulu/enabled-vs-enable
...
Check for common error: using enabled option instead of enable
2013-07-27 13:27:59 -07:00
Thomas S Hatch
aa66ccca56
Merge pull request #6358 from KB1JWQ/Corey-fix_cpumodel
...
Fix cpu_model output on OS X
2013-07-27 13:18:39 -07:00
David Lindquist
06312dfbd8
Check for common error: using enabled option instead of enable
2013-07-27 13:16:36 -07:00
Corey Quinn
15f5374693
Fix cpu_model output on OS X
2013-07-27 13:15:58 -07:00
Thomas S Hatch
5d6447e97b
Merge pull request #6357 from iquaba/develop
...
modernized windows check
2013-07-27 13:14:07 -07:00
Thomas S Hatch
b05cc389e9
Merge pull request #6356 from kula/fix_5641
...
Fix HTTP authentication support in the cp module
2013-07-27 12:59:31 -07:00
iquaba
7b6e756ec8
modernized windows check
2013-07-27 12:52:23 -07:00
Thomas L. Kula
4f3639301f
Fix HTTP authentication support in the cp module
...
If you have a userinfo component in an RFC 3986 URI, the default
handling of the python urllibs is to complain about a non-numeric
port.
This fix handles the case where there is a userinfo component (e.g.
http://user:pass@server.name/path/to/file ), parsing it out,
creating a basicauth handler, and passing url_open a url it can
understand.
FIXES Issue #5641
2013-07-27 15:51:41 -04:00
Thomas S Hatch
a18bc46a3b
Merge pull request #6355 from saurabhsurana/rabbitmq-module-add-commands
...
added status commands to rabbitmq module
2013-07-27 12:37:31 -07:00
Saurabh Surana
c0448bef6b
added status commands to rabbitmq module
2013-07-27 12:35:33 -07:00
Thomas S Hatch
57743f71ee
Merge pull request #6354 from jslatts/issue_4948_output_state
...
Issue #4948 - add state_output argument to allow override of value configured in master
2013-07-27 12:26:09 -07:00
Justin Slattery
309d5c8cde
Issue #4948 - add state_output argument to allow override of value configured in master
2013-07-27 15:22:54 -04:00
Thomas S Hatch
0a79636852
Merge pull request #6351 from hulu/use-os-getloadavg
...
Use os.getloadavg output directly
2013-07-27 11:47:34 -07:00
David Lindquist
6fde4930b3
Use os.getloadavg output directly
2013-07-27 11:43:43 -07:00
Thomas S Hatch
9f5c3ccc3d
Merge pull request #6349 from s0undt3ch/sprint/mock-salt.modules.archive
...
Mock tests for `salt.modules.archive`
2013-07-27 11:34:54 -07:00
Joseph Hall
f6189236d4
Merge pull request #6350 from AlcariTheMad/develop
...
Fixes issue 6297: mysql.processlist no longer recurses infinitely
2013-07-27 11:27:46 -07:00
Pedro Algarvio
dcdb9bf686
Mocked test for salt.modules.archive.tar()
2013-07-27 19:24:49 +01:00
Colin Valliant
031bdb6ada
Fixes issue 6297: mysql.processlist no longer recurses infinitely
2013-07-27 12:19:21 -06:00
Pedro Algarvio
2f8b564259
Don't obfuscate thezip built-in.
2013-07-27 19:13:35 +01:00
Pedro Algarvio
61afe18168
One less TODO. Check for the existence of the binary before running the function.
2013-07-27 19:10:03 +01:00
Joseph Hall
cadef8aa64
Merge pull request #6348 from KB1JWQ/Corey-fixloadaverage
...
Remove needlessly complex logic
2013-07-27 11:07:55 -07:00
Pedro Algarvio
69e30346ca
Added a which decorator to be used in functions which require a specific binary.
2013-07-27 19:03:54 +01:00
Corey Quinn
ac6d774f90
Remove needlessly complex logic
2013-07-27 10:54:44 -07:00
