Commit Graph

13514 Commits

Author SHA1 Message Date
Thomas S Hatch
5c636b6fcb Merge pull request #5074 from hulu/debconfmod-shadow-type
debconfmod: type -> type_, to avoid shadowing built-in type 'type'
2013-05-16 22:11:17 -07:00
Thomas S Hatch
6b3915e343 Merge pull request #5073 from hulu/ldap-builtin-shadowing
auth.ldap: avoid shadowing builtins: dict->variables, filter->filter_
2013-05-16 22:07:02 -07:00
Thomas S Hatch
bcead21a74 Merge pull request #5071 from hulu/blocks-shadowing
extfs module: blocks -> free_blocks, to avoid shadowing same-named func
2013-05-16 22:04:02 -07:00
Thomas S Hatch
ac71b5c571 Merge pull request #5070 from hulu/installed-shadowing
npm state: installed -> installed_pkgs, to avoid shadowing func of same name
2013-05-16 22:03:39 -07:00
Joseph Hall
95356f2530 Merge pull request #5072 from hulu/address-shadowing
bluez mod: address -> addr, to avoid shadowing same-named func
2013-05-16 19:12:20 -07:00
Chris Rebert
e21d717eee file mod: rm unnecessary temp var to avoid shadowing outer mkdir() func 2013-05-16 19:10:38 -07:00
Chris Rebert
e63b3f0635 file state: exists -> extant, to avoid shadowing same-named func 2013-05-16 19:06:54 -07:00
Chris Rebert
d9c3be6497 file state: refactor to avoid shadowing comment() func; optimization too 2013-05-16 19:00:10 -07:00
Joseph Hall
1013ed3ea8 Merge pull request #5079 from hulu/grub-conf-shadowing
grub_legacy: refactor to avoid shadowing conf() function
2013-05-16 18:50:20 -07:00
Chris Rebert
bcafd2ad86 network mod: rename subnets -> subnetworks, to avoid shadowing func 2013-05-16 18:49:24 -07:00
Chris Rebert
15b531e7b1 grub_legacy: refactor to avoid shadowing conf() function 2013-05-16 18:44:28 -07:00
Chris Rebert
4dafa17dde rename/refactor to avoid shadowing version() functions 2013-05-16 18:36:16 -07:00
Joseph Hall
d7871015a6 Merge pull request #5076 from hulu/git-status-shadowing
git mod: status -> state_by_file, to avoid shadowing same-named func
2013-05-16 18:01:38 -07:00
Chris Rebert
56225b3a6f win_service mod: status -> statuses, to avoid shadowing same-named func 2013-05-16 17:52:21 -07:00
Chris Rebert
2a83460150 git mod: status -> state_by_file, to avoid shadowing same-named func 2013-05-16 17:45:45 -07:00
Chris Rebert
3f7037ec8d pydsl: id -> state_id, to avoid shadowing the built-in func 2013-05-16 17:39:49 -07:00
Chris Rebert
4b1fa03311 debconfmod: type -> type_, to avoid shadowing built-in type 'type' 2013-05-16 17:33:18 -07:00
Chris Rebert
922c199039 auth.ldap: avoid shadowing builtins: dict->variables, filter->filter_ 2013-05-16 17:15:25 -07:00
Chris Rebert
ab8a1c3ce3 bluez mod: address -> addr, to avoid shadowing same-named func 2013-05-16 17:11:32 -07:00
Chris Rebert
c49980ad46 extfs module: blocks -> free_blocks, to avoid shadowing same-named func 2013-05-16 17:04:59 -07:00
Chris Rebert
fa75d15d67 npm state: installed -> installed_pkgs, to avoid shadowing func of same name 2013-05-16 17:01:52 -07:00
Thomas S Hatch
6122b8a2b5 Merge pull request #5069 from hulu/package-shadowing
payload.py: package -> pkg, to avoid shadowing func of same name
2013-05-16 17:00:31 -07:00
Chris Rebert
f6be18aafa payload.py: package -> pkg, to avoid shadowing func of same name 2013-05-16 16:57:40 -07:00
Thomas S Hatch
856eeb7746 Add docs for #5035 2013-05-16 17:51:50 -06:00
Thomas S Hatch
a63b133048 Clean up relative imports via an init.sls, fix #5035 2013-05-16 17:48:46 -06:00
Colton Myers
13aa96a613 Merge pull request #5068 from UtahDave/develop
Remove redundant os check
2013-05-16 16:52:52 -07:00
David Boucha
843ee069d8 Remove redundant os check
Fixes #5045
2013-05-16 17:50:44 -06:00
Thomas S Hatch
a7d7bb77b1 Merge pull request #5067 from hulu/ps-list-comp
ps module: simplify by using list comprehensions
2013-05-16 16:50:29 -07:00
Chris Rebert
678f059052 simplify by using list comprehensions 2013-05-16 16:49:12 -07:00
Thomas S Hatch
7772c97b8e Merge pull request #5066 from hulu/file-shadowing
rename to avoid shadowing built-in type 'file'
2013-05-16 16:43:07 -07:00
Thomas S Hatch
741d783255 Merge pull request #5065 from hulu/type-shadowing
rename to avoid shadowing built-in type 'type'
2013-05-16 16:42:44 -07:00
Chris Rebert
a80af05405 rename to avoid shadowing built-in type 'file' 2013-05-16 16:41:43 -07:00
Chris Rebert
d473176096 rename to avoid shadowing built-in type 'type' 2013-05-16 16:36:36 -07:00
Thomas S Hatch
cca099e41c Extend get_state to return a dict with the source
And add suport to read in relative includes in states for init.sls
2013-05-16 17:36:17 -06:00
Thomas S Hatch
bddcf5cb0c Merge pull request #5064 from hulu/range-shadowing
rename to avoid shadowing 'range' built-in
2013-05-16 16:28:18 -07:00
Chris Rebert
349fc6b8f7 rename to avoid shadowing 'range' built-in 2013-05-16 16:26:28 -07:00
Thomas S Hatch
624b51a138 Start on #5035, still needs support for init.sls 2013-05-16 17:20:55 -06:00
Thomas S Hatch
d642d5150d Merge pull request #5060 from iMilnb/develop
Added support for (Net|Open)BSD's ethernet addresses and netmasks
2013-05-16 15:24:04 -07:00
Thomas S Hatch
48ab379eed Fix #5121 2013-05-16 15:57:55 -06:00
Thomas S Hatch
d275a8849a Merge pull request #5119 from hulu/win_useradd-shadowing
win_useradd: info -> user_info, to avoid shadowing info() func
2013-05-17 20:22:40 -07:00
Thomas S Hatch
e75255dc95 Merge pull request #5118 from hulu/netbsdservice-shadowing
netbsdservice mod: status -> service_status, to avoid shadowing status()
2013-05-17 20:20:51 -07:00
Thomas S Hatch
ed8b371c6e Merge pull request #5117 from cvrebert/patch-1
win_pkg mod: actually invoke refresh_db
2013-05-17 20:20:16 -07:00
Thomas S Hatch
93dcffbb95 Merge pull request #5116 from hulu/grains-backslashes
fix pylint W1401 (Anomalous backslash in string) problems in grains.core
2013-05-17 20:19:39 -07:00
Thomas S Hatch
d7f357abfe Merge pull request #5115 from hulu/sentry_return
sentry_return: returner.connect_sentry() being called w/ too many args
2013-05-17 20:18:36 -07:00
Chris Rebert
1e6968d039 win_useradd: info -> user_info, to avoid shadowing info() func 2013-05-17 17:05:29 -07:00
Chris Rebert
c73e047e0f netbsdservice mod: status -> service_status, to avoid shadowing status() func 2013-05-17 16:57:52 -07:00
Chris Rebert
3ced87a066 win_pkg mod: actually invoke refresh_db 2013-05-17 17:26:13 -06:00
Chris Rebert
14a6781e70 fix pylint W1401 (Anomalous backslash in string) problems in grains.core 2013-05-17 16:20:48 -07:00
Chris Rebert
47d9bd1a34 sentry_return: returner.connect_sentry() being called w/ too many args 2013-05-17 16:08:39 -07:00
Thomas S Hatch
eaeed4c592 clean up zpool and fix #5114 2013-05-16 15:43:34 -06:00