Erik Johnson
90304e05ee
Fix dig tests
...
Added a side_effect function to allow for testing of recursive functions
in the SPF tests. Also enabled all skipped tests as they now all pass.
2014-02-13 12:38:11 -06:00
Thayne Harbaugh
9099cdad9c
include msgpack in thin.tgz
...
While msgpack is an extmod (it uses an platform-dependent .so) it
includes a pure python fallback. Including it in thin will not create
a protability problem.
Fixes #10425
2014-02-13 11:10:29 -07:00
Michael Birtwell
6a3a483355
Squash some pylint warnings
2014-02-13 13:45:43 +00:00
Michael Birtwell
c2d9af2d35
Modify syndic main loop to make it more responsive
...
Should fix:
* new_job events from the syndic masters some times take a long time to be
returned
* saltutil.find_job commands sometimes take a long time to propagate
through the syndic to the syndic minions.
2014-02-13 13:45:43 +00:00
Michael Birtwell
6b16066ea7
Logging
2014-02-13 13:43:31 +00:00
Pedro Algarvio
3da1bae68f
Merge pull request #10416 from UtahDave/fix_win_filemanaged
...
Fix win filemanaged fixes #10362
2014-02-13 11:33:00 +00:00
David Boucha
8a8fd2cedb
Merge pull request #10412 from obestwalter/patch-1
...
fix typo in docstring
2014-02-13 03:27:21 -07:00
David Boucha
396911003c
namespace win_file.append
...
fixes #10233
2014-02-13 03:14:18 -07:00
David Boucha
22e680c697
properly namespace win_file.remove
...
fixes #10233
2014-02-13 03:10:46 -07:00
David Boucha
34c068ec49
use two spaces before inline comment
...
Keep pylint happy
2014-02-13 02:54:32 -07:00
Thayne Harbaugh
f1f6c45f13
Preserve cmd.run variants issued over SSH.
...
Previously SSH quashed cmd.run_stdout, cmd.run_stderr and cmd.run_all
to cmd.run.
Fixes #10415
2014-02-13 02:14:59 -07:00
David Boucha
d1d63974ee
add missing imports
2014-02-13 02:11:31 -07:00
David Boucha
69c2c644a8
add more namespaced modules for windows
2014-02-13 01:55:56 -07:00
David Boucha
01ab5ac943
catch NameError because of Windows
2014-02-13 01:53:27 -07:00
Oliver Bestwalter
983697c2be
fix typo in docstring
2014-02-13 09:06:28 +01:00
Pedro Algarvio
ba7a92860c
Merge pull request #10411 from johnnoone/patch-1
...
Update yamldumper.py
2014-02-13 08:03:52 +00:00
Xavier Barbosa
d7eb1d2f9d
fix jinja SequenceExtension
2014-02-13 08:59:29 +01:00
johnnoone
0a1700b64a
Update yamldumper.py
...
fixed wrong import
2014-02-13 08:51:33 +01:00
Christopher A. Stelma
1d07c56d7f
DRY schedule eval
2014-02-12 23:07:55 -08:00
Christopher A. Stelma
6bac220cfe
DRY socket polling/recv
2014-02-12 23:07:55 -08:00
Christopher A. Stelma
aaf8046b28
folow pattern for checking POLLIN
2014-02-12 23:07:55 -08:00
Thomas Jackson
dc9edc302b
Fix race condition in get_cache_returns if you ask for the return right after starting the job
2014-02-12 21:17:32 -08:00
Joseph Hall
1026dbea61
Merge pull request #10405 from cachedout/getting_started
...
Improvements to clarity and readability.
2014-02-12 19:31:21 -07:00
Erik Johnson
5c446c50dd
Fixed unit tests
...
Had to skip two tests because I don't know how to mock properly when
recursion is involved.
Also made some PEP8 fixes.
2014-02-12 20:17:52 -06:00
Mike Place
cdd163569c
Improvements to clarity and readability. New YAML page, currently unlinked.
2014-02-12 17:15:05 -07:00
Thomas S Hatch
ae961b689d
remove unused import
2014-02-12 16:02:21 -07:00
Thomas S Hatch
7c976f5671
Merge pull request #10401 from rallytime/dnsutil_test
...
Started testing dnsutil
2014-02-12 15:51:09 -07:00
Erik Johnson
858698be84
Make dig.SPF recurse include and redirect entries
2014-02-12 16:45:39 -06:00
Erik Johnson
4ac917ae98
Log dig command output at debug
2014-02-12 16:45:39 -06:00
Erik Johnson
b69234e744
Alias lowercase versions of functions
2014-02-12 16:45:39 -06:00
Erik Johnson
63b4de2601
Remove needless regex checks
...
Using socket.inet_pton() is more efficient, and less error prone, than
using regexes.
2014-02-12 16:45:39 -06:00
Erik Johnson
47b2393f63
Simplify __virtual__function
2014-02-12 16:45:39 -06:00
rallytime
661ed0ef2d
Started testing dnsutil
2014-02-12 14:53:58 -07:00
Thomas S Hatch
1ee5d4783e
Add docstring to saltutil.mmodule
2014-02-12 14:24:11 -07:00
Thomas S Hatch
54881470fb
Stub out lint issues in the mmodule
2014-02-12 14:22:09 -07:00
Thomas S Hatch
89affa8040
temporarily disable lint on raet files until the dust settles
2014-02-12 14:07:56 -07:00
Thomas S Hatch
7be372fb09
Whitespace
2014-02-12 13:41:56 -07:00
Thomas S Hatch
3c3bf21d44
Call parent class __init__
2014-02-12 13:39:26 -07:00
Thomas S Hatch
3fb1e0b60c
stacking whitespace cleanup
2014-02-12 13:27:01 -07:00
Thomas S Hatch
ad751a41b6
whitespace and lint
2014-02-12 13:19:24 -07:00
Thomas S Hatch
d03a134011
single quotes
2014-02-12 13:18:18 -07:00
Joseph Hall
588a744784
Merge pull request #10396 from hulu/fix-indent-whitespace
...
fix indentation & trailing whitespace in pkg state
2014-02-12 12:55:57 -07:00
Joseph Hall
acbb9a4569
Merge pull request #10398 from hulu/pkg-res-shadow
...
modules.pkg_resource: avoid shadowing outer version() func
2014-02-12 12:54:21 -07:00
Pedro Algarvio
1c5f82bd11
Merge pull request #10399 from hulu/lxc-shadowing
...
avoid shadowing outer funcs in modules.lxc.list_()
2014-02-12 18:55:33 +00:00
Chris Rebert
c820bdbeed
avoid shadowing outer funcs in modules.lxc.list_()
...
************* Module salt.modules.lxc
salt/modules/lxc.py:294: [W0621(redefined-outer-name), list_] Redefining name 'info' from outer scope (line 468)
salt/modules/lxc.py:297: [W0621(redefined-outer-name), list_] Redefining name 'state' from outer scope (line 409
2014-02-12 10:46:49 -08:00
Chris Rebert
1d0ce14f4a
modules.pkg_resource: avoid shadowing outer version() func
2014-02-12 10:42:35 -08:00
Pedro Algarvio
2210247ede
Merge pull request #10397 from cvrebert/patch-1
...
rm unused imports in deb_apache module
2014-02-12 18:42:33 +00:00
Chris Rebert
9c6fcdd4a7
rm unused imports in deb_apache module
...
************* Module salt.modules.deb_apache
salt/modules/deb_apache.py:14: [W0611(unused-import), ] Unused import urllib2
salt/modules/deb_apache.py:12: [W0611(unused-import), ] Unused import re
2014-02-12 10:37:42 -08:00
Chris Rebert
ab0c233fc3
fix indentation & trailing whitespace in pkg state
2014-02-12 10:35:01 -08:00
Pedro Algarvio
be8d29e108
Merge pull request #10395 from cvrebert/patch-1
...
apache module: rm unused import of `os`
2014-02-12 18:32:43 +00:00
