Commit Graph

26122 Commits

Author SHA1 Message Date
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
Chris Rebert
b76d8f8cef apache module: rm unused import of os
************* Module salt.modules.apache
salt/modules/apache.py:12: [W0611(unused-import), ] Unused import os
2014-02-12 10:29:10 -08:00
Thomas S Hatch
c1be7caa08 Merge pull request #10393 from rallytime/dnsutil_test
Fixed Test
2014-02-12 11:26:16 -07:00
rallytime
2035e7d153 Added S0undt3ch's skipIf suggestion 2014-02-12 11:04:35 -07:00
Thomas S Hatch
19610afac0 Merge pull request #10376 from bemehow/skip_suggestions_pkg
added strick package name matching flag, skip_suggestions
2014-02-12 10:56:00 -07:00
Thomas S Hatch
b1e904d384 single quotes 2014-02-12 10:49:00 -07:00
Thomas S Hatch
546c5d1534 Merge pull request #10364 from johnnoone/yaml-dumper
added yaml dumper that renders OrderedDict to YAML map
2014-02-12 10:46:45 -07:00
Thomas S Hatch
a8b3b121b0 Merge pull request #10338 from bemehow/mount-fix
handling lack of fstab as not-error
2014-02-12 10:44:40 -07:00
Thomas S Hatch
0d9b9f2679 Merge pull request #10249 from Stelminator/minion_dry
DRY up a bunch of shared minion code.
2014-02-12 10:38:15 -07:00
Thomas S Hatch
72c763296c Merge pull request #10390 from SmithSamuelM/sam_raet_3
Sam raet 3
2014-02-12 10:37:44 -07:00
rallytime
1b55edd4fb We cannot use the requires_salt_modules decorator because we do not inherit from an integration test class. 2014-02-12 10:36:22 -07:00
Pedro Algarvio
88ed72ced5 Merge pull request #10392 from techhat/apache
Break out Debian-specific functions into deb_apache.py
2014-02-12 17:35:06 +00:00
Joseph Hall
e7344ad577 Fix docstrings for mod functions 2014-02-12 10:22:01 -07:00
Joseph Hall
e21cb98850 Break out Debian-specific functions into deb_apache.py 2014-02-12 10:12:04 -07:00
Thomas S Hatch
8f0032b1a6 Clean up and refactor mmodule over to saltutil per #10273 2014-02-12 10:03:15 -07:00
Samuel M Smith
ebae5afc64 Merge remote-tracking branch 'upstream/develop' into sam_raet_2
Conflicts:
	salt/transport/road/raet/stacking.py
	salt/transport/road/raet/test/test_stacking.py
2014-02-12 10:02:39 -07:00
Thomas S Hatch
93d56eb74b Merge pull request #10273 from kenatbasis/master_module
Adds master module for populating pillars via external module
2014-02-12 10:00:09 -07:00
Samuel M Smith
f2644375fd Basic raet handshake onto channel to get device id 2014-02-12 09:56:34 -07:00
Thomas S Hatch
9ac6c8a1e8 Merge pull request #9904 from mbirtwell/fix_saltenv_priority
Always give saltenv argument highest priority
2014-02-12 09:53:08 -07:00
Pedro Algarvio
9cbc4b5010 Merge pull request #10389 from techhat/docfix
libcloud is still a hard dep for salt-cloud, but not salt
2014-02-12 16:51:22 +00:00
Joseph Hall
b1695cef8d libcloud is still a hard dep for salt-cloud, but not salt 2014-02-12 09:39:28 -07:00
Joseph Hall
36db5eb73a Merge pull request #10386 from s0undt3ch/hotfix/cloud-docstring
"Obfuscate" and add a docstrign explaining purpose. Fixes #10341.
2014-02-12 09:38:01 -07:00
Pedro Algarvio
75016a0f34 "Obfuscate" and add a docstrign explaining purpose. Fixes #10341. 2014-02-12 16:35:04 +00:00